format.cxx (56b35d86) format.cxx (c5e17f44)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 457 unchanged lines hidden (view full) ---

466 if(aFill.get() && aFill->isUsed())
467 {
468 // if yes, fill the local SvxBrushItem using the new fill attributes
469 // as good as possible to have an instance for the pointer to point
470 // to and return as state that it is set
471 static SvxBrushItem aSvxBrushItem(RES_BACKGROUND);
472
473 aSvxBrushItem = getSvxBrushItemFromSourceSet(aSet, RES_BACKGROUND, bSrchInParent);
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 457 unchanged lines hidden (view full) ---

466 if(aFill.get() && aFill->isUsed())
467 {
468 // if yes, fill the local SvxBrushItem using the new fill attributes
469 // as good as possible to have an instance for the pointer to point
470 // to and return as state that it is set
471 static SvxBrushItem aSvxBrushItem(RES_BACKGROUND);
472
473 aSvxBrushItem = getSvxBrushItemFromSourceSet(aSet, RES_BACKGROUND, bSrchInParent);
474 *ppItem = &aSvxBrushItem;
474 if( ppItem )
475 *ppItem = &aSvxBrushItem;
475
476 return SFX_ITEM_SET;
477 }
478
479 // if not, reset pointer and return SFX_ITEM_DEFAULT to signal that
480 // the item is not set
476
477 return SFX_ITEM_SET;
478 }
479
480 // if not, reset pointer and return SFX_ITEM_DEFAULT to signal that
481 // the item is not set
481 *ppItem = 0;
482 if( ppItem )
483 *ppItem = NULL;
482
483 return SFX_ITEM_DEFAULT;
484 }
485
486 return aSet.GetItemState( nWhich, bSrchInParent, ppItem );
487}
488
489

--- 381 unchanged lines hidden --- 		484
485 return SFX_ITEM_DEFAULT;
486 }
487
488 return aSet.GetItemState( nWhich, bSrchInParent, ppItem );
489}
490
491

--- 381 unchanged lines hidden ---