[Libreoffice-commits] core.git: 3 commits - sw/inc sw/source
Michael Stahl
mstahl at redhat.com
Wed Jul 2 08:39:23 PDT 2014
sw/inc/cmdid.h | 1
sw/inc/unoprnms.hxx | 104 ++++++++++++++++++------------------
sw/source/core/unocore/unostyle.cxx | 49 ----------------
3 files changed, 53 insertions(+), 101 deletions(-)
New commits:
commit 7a361dc2aa02b7518c83ba5ca5d3c687c3de6cff
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 2 17:20:28 2014 +0200
sw: SwXAutoStyle::mpSet is read-only
... because it is an alias to the item set that is stored in the core
auto-style cache, which must _not_ be modified.
So remove the implementation of SwXAutoStyle::setPropertiesToDefault().
(regression from commit 7d9bb549d498d6beed2c4050c402d09643febdfa)
Change-Id: If529862d14a1c1e700ac898964560f386bf488f8
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 4c13a5c..8e75c49 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -4869,56 +4869,9 @@ void SwXAutoStyle::setAllPropertiesToDefault( )
}
void SwXAutoStyle::setPropertiesToDefault(
- const uno::Sequence< OUString >& rPropertyNames )
+ const uno::Sequence< OUString >& /*rPropertyNames*/ )
throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
- if( !mpSet.get() )
- {
- throw uno::RuntimeException();
- }
-
- const bool bTakeCareOfDrawingLayerFillStyle(IStyleAccess::AUTO_STYLE_PARA == meFamily);
-
- if(!bTakeCareOfDrawingLayerFillStyle)
- {
- return;
- }
-
- //UUUU support DrawingLayer FillStyle slots from here on
- SolarMutexGuard aGuard;
- const OUString* pNames = rPropertyNames.getConstArray();
- sal_Int8 nPropSetId = PROPERTY_MAP_CHAR_AUTO_STYLE;
-
- switch(meFamily)
- {
- case IStyleAccess::AUTO_STYLE_CHAR : nPropSetId = PROPERTY_MAP_CHAR_AUTO_STYLE; break;
- case IStyleAccess::AUTO_STYLE_RUBY : nPropSetId = PROPERTY_MAP_RUBY_AUTO_STYLE; break;
- case IStyleAccess::AUTO_STYLE_PARA : nPropSetId = PROPERTY_MAP_PARA_AUTO_STYLE; break;
- default: ;
- }
-
- const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(nPropSetId);
- const SfxItemPropertyMap& rMap = pPropSet->getPropertyMap();
-
- for(sal_Int32 i = 0; i < rPropertyNames.getLength(); i++)
- {
- const OUString& rPropName = pNames[i];
- const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rPropName);
-
- if(!pEntry)
- {
- throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) );
- }
-
- switch(pEntry->nWID)
- {
- case OWN_ATTR_FILLBMP_MODE:
- {
- mpSet->ClearItem(XATTR_FILLBMP_STRETCH);
- mpSet->ClearItem(XATTR_FILLBMP_TILE);
- }
- }
- }
}
uno::Sequence< uno::Any > SwXAutoStyle::getPropertyDefaults(
commit 79677440c88b269c7fef53b3c43f30e357050402
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 2 17:17:46 2014 +0200
sw: clean up over-abstracted string constants
Grepping for a property name should find something.
Change-Id: I908d514d5dcfd16951ebbb0157a6af9646e6db53
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 1974304..863b5ce 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -663,59 +663,59 @@
#define UNO_NAME_SW_FILLTRANSPARENCEGRADIENTNAME UNO_NAME_FILLTRANSPARENCEGRADIENTNAME
#define UNO_NAME_SW_FILLCOLOR_2 UNO_NAME_FILLCOLOR_2
-#define UNO_NAME_HEADER_FILLBMP_LOGICAL_SIZE "Header" UNO_NAME_FILLBMP_LOGICAL_SIZE
-#define UNO_NAME_HEADER_FILLBMP_OFFSET_X "Header" UNO_NAME_FILLBMP_OFFSET_X
-#define UNO_NAME_HEADER_FILLBMP_OFFSET_Y "Header" UNO_NAME_FILLBMP_OFFSET_Y
-#define UNO_NAME_HEADER_FILLBMP_POSITION_OFFSET_X "Header" UNO_NAME_FILLBMP_POSITION_OFFSET_X
-#define UNO_NAME_HEADER_FILLBMP_POSITION_OFFSET_Y "Header" UNO_NAME_FILLBMP_POSITION_OFFSET_Y
-#define UNO_NAME_HEADER_FILLBMP_RECTANGLE_POINT "Header" UNO_NAME_FILLBMP_RECTANGLE_POINT
-#define UNO_NAME_HEADER_FILLBMP_SIZE_X "Header" UNO_NAME_FILLBMP_SIZE_X
-#define UNO_NAME_HEADER_FILLBMP_SIZE_Y "Header" UNO_NAME_FILLBMP_SIZE_Y
-#define UNO_NAME_HEADER_FILLBMP_STRETCH "Header" UNO_NAME_FILLBMP_STRETCH
-#define UNO_NAME_HEADER_FILLBMP_TILE "Header" UNO_NAME_FILLBMP_TILE
-#define UNO_NAME_HEADER_FILLBMP_MODE "Header" UNO_NAME_FILLBMP_MODE
-#define UNO_NAME_HEADER_FILLCOLOR "Header" UNO_NAME_FILLCOLOR
-#define UNO_NAME_HEADER_FILLBACKGROUND "Header" UNO_NAME_FILLBACKGROUND
-#define UNO_NAME_HEADER_FILLBITMAP "Header" UNO_NAME_FILLBITMAP
-#define UNO_NAME_HEADER_FILLBITMAPNAME "Header" UNO_NAME_FILLBITMAPNAME
-#define UNO_NAME_HEADER_FILLBITMAPURL "Header" UNO_NAME_FILLBITMAPURL
-#define UNO_NAME_HEADER_FILLGRADIENTSTEPCOUNT "Header" UNO_NAME_FILLGRADIENTSTEPCOUNT
-#define UNO_NAME_HEADER_FILLGRADIENT "Header" UNO_NAME_FILLGRADIENT
-#define UNO_NAME_HEADER_FILLGRADIENTNAME "Header" UNO_NAME_FILLGRADIENTNAME
-#define UNO_NAME_HEADER_FILLHATCH "Header" UNO_NAME_FILLHATCH
-#define UNO_NAME_HEADER_FILLHATCHNAME "Header" UNO_NAME_FILLHATCHNAME
-#define UNO_NAME_HEADER_FILLSTYLE "Header" UNO_NAME_FILLSTYLE
-#define UNO_NAME_HEADER_FILL_TRANSPARENCE "Header" UNO_NAME_FILL_TRANSPARENCE
-#define UNO_NAME_HEADER_FILLTRANSPARENCEGRADIENT "Header" UNO_NAME_FILLTRANSPARENCEGRADIENT
-#define UNO_NAME_HEADER_FILLTRANSPARENCEGRADIENTNAME "Header" UNO_NAME_FILLTRANSPARENCEGRADIENTNAME
-#define UNO_NAME_HEADER_FILLCOLOR_2 "Header" UNO_NAME_FILLCOLOR_2
+#define UNO_NAME_HEADER_FILLBMP_LOGICAL_SIZE "HeaderFillBitmapLogicalSize"
+#define UNO_NAME_HEADER_FILLBMP_OFFSET_X "HeaderFillBitmapOffsetX"
+#define UNO_NAME_HEADER_FILLBMP_OFFSET_Y "HeaderFillBitmapOffsetY"
+#define UNO_NAME_HEADER_FILLBMP_POSITION_OFFSET_X "HeaderFillBitmapPositionOffsetX"
+#define UNO_NAME_HEADER_FILLBMP_POSITION_OFFSET_Y "HeaderFillBitmapPositionOffsetY"
+#define UNO_NAME_HEADER_FILLBMP_RECTANGLE_POINT "HeaderFillBitmapRectanglePoint"
+#define UNO_NAME_HEADER_FILLBMP_SIZE_X "HeaderFillBitmapSizeX"
+#define UNO_NAME_HEADER_FILLBMP_SIZE_Y "HeaderFillBitmapSizeY"
+#define UNO_NAME_HEADER_FILLBMP_STRETCH "HeaderFillBitmapStretch"
+#define UNO_NAME_HEADER_FILLBMP_TILE "HeaderFillBitmapTile"
+#define UNO_NAME_HEADER_FILLBMP_MODE "HeaderFillBitmapMode"
+#define UNO_NAME_HEADER_FILLCOLOR "HeaderFillColor"
+#define UNO_NAME_HEADER_FILLBACKGROUND "HeaderFillBackground"
+#define UNO_NAME_HEADER_FILLBITMAP "HeaderFillBitmap"
+#define UNO_NAME_HEADER_FILLBITMAPNAME "HeaderFillBitmapName"
+#define UNO_NAME_HEADER_FILLBITMAPURL "HeaderFillBitmapURL"
+#define UNO_NAME_HEADER_FILLGRADIENTSTEPCOUNT "HeaderFillGradientStepCount"
+#define UNO_NAME_HEADER_FILLGRADIENT "HeaderFillGradient"
+#define UNO_NAME_HEADER_FILLGRADIENTNAME "HeaderFillGradientName"
+#define UNO_NAME_HEADER_FILLHATCH "HeaderFillHatch"
+#define UNO_NAME_HEADER_FILLHATCHNAME "HeaderFillHatchName"
+#define UNO_NAME_HEADER_FILLSTYLE "HeaderFillStyle"
+#define UNO_NAME_HEADER_FILL_TRANSPARENCE "HeaderFillTransparence"
+#define UNO_NAME_HEADER_FILLTRANSPARENCEGRADIENT "HeaderFillTransparenceGradient"
+#define UNO_NAME_HEADER_FILLTRANSPARENCEGRADIENTNAME "HeaderFillTransparenceGradientName"
+#define UNO_NAME_HEADER_FILLCOLOR_2 "HeaderFillColor2"
-#define UNO_NAME_FOOTER_FILLBMP_LOGICAL_SIZE "Footer" UNO_NAME_FILLBMP_LOGICAL_SIZE
-#define UNO_NAME_FOOTER_FILLBMP_OFFSET_X "Footer" UNO_NAME_FILLBMP_OFFSET_X
-#define UNO_NAME_FOOTER_FILLBMP_OFFSET_Y "Footer" UNO_NAME_FILLBMP_OFFSET_Y
-#define UNO_NAME_FOOTER_FILLBMP_POSITION_OFFSET_X "Footer" UNO_NAME_FILLBMP_POSITION_OFFSET_X
-#define UNO_NAME_FOOTER_FILLBMP_POSITION_OFFSET_Y "Footer" UNO_NAME_FILLBMP_POSITION_OFFSET_Y
-#define UNO_NAME_FOOTER_FILLBMP_RECTANGLE_POINT "Footer" UNO_NAME_FILLBMP_RECTANGLE_POINT
-#define UNO_NAME_FOOTER_FILLBMP_SIZE_X "Footer" UNO_NAME_FILLBMP_SIZE_X
-#define UNO_NAME_FOOTER_FILLBMP_SIZE_Y "Footer" UNO_NAME_FILLBMP_SIZE_Y
-#define UNO_NAME_FOOTER_FILLBMP_STRETCH "Footer" UNO_NAME_FILLBMP_STRETCH
-#define UNO_NAME_FOOTER_FILLBMP_TILE "Footer" UNO_NAME_FILLBMP_TILE
-#define UNO_NAME_FOOTER_FILLBMP_MODE "Footer" UNO_NAME_FILLBMP_MODE
-#define UNO_NAME_FOOTER_FILLCOLOR "Footer" UNO_NAME_FILLCOLOR
-#define UNO_NAME_FOOTER_FILLBACKGROUND "Footer" UNO_NAME_FILLBACKGROUND
-#define UNO_NAME_FOOTER_FILLBITMAP "Footer" UNO_NAME_FILLBITMAP
-#define UNO_NAME_FOOTER_FILLBITMAPNAME "Footer" UNO_NAME_FILLBITMAPNAME
-#define UNO_NAME_FOOTER_FILLBITMAPURL "Footer" UNO_NAME_FILLBITMAPURL
-#define UNO_NAME_FOOTER_FILLGRADIENTSTEPCOUNT "Footer" UNO_NAME_FILLGRADIENTSTEPCOUNT
-#define UNO_NAME_FOOTER_FILLGRADIENT "Footer" UNO_NAME_FILLGRADIENT
-#define UNO_NAME_FOOTER_FILLGRADIENTNAME "Footer" UNO_NAME_FILLGRADIENTNAME
-#define UNO_NAME_FOOTER_FILLHATCH "Footer" UNO_NAME_FILLHATCH
-#define UNO_NAME_FOOTER_FILLHATCHNAME "Footer" UNO_NAME_FILLHATCHNAME
-#define UNO_NAME_FOOTER_FILLSTYLE "Footer" UNO_NAME_FILLSTYLE
-#define UNO_NAME_FOOTER_FILL_TRANSPARENCE "Footer" UNO_NAME_FILL_TRANSPARENCE
-#define UNO_NAME_FOOTER_FILLTRANSPARENCEGRADIENT "Footer" UNO_NAME_FILLTRANSPARENCEGRADIENT
-#define UNO_NAME_FOOTER_FILLTRANSPARENCEGRADIENTNAME "Footer" UNO_NAME_FILLTRANSPARENCEGRADIENTNAME
-#define UNO_NAME_FOOTER_FILLCOLOR_2 "Footer" UNO_NAME_FILLCOLOR_2
+#define UNO_NAME_FOOTER_FILLBMP_LOGICAL_SIZE "FooterFillBitmapLogicalSize"
+#define UNO_NAME_FOOTER_FILLBMP_OFFSET_X "FooterFillBitmapOffsetX"
+#define UNO_NAME_FOOTER_FILLBMP_OFFSET_Y "FooterFillBitmapOffsetY"
+#define UNO_NAME_FOOTER_FILLBMP_POSITION_OFFSET_X "FooterFillBitmapPositionOffsetX"
+#define UNO_NAME_FOOTER_FILLBMP_POSITION_OFFSET_Y "FooterFillBitmapPositionOffsetY"
+#define UNO_NAME_FOOTER_FILLBMP_RECTANGLE_POINT "FooterFillBitmapRectanglePoint"
+#define UNO_NAME_FOOTER_FILLBMP_SIZE_X "FooterFillBitmapSizeX"
+#define UNO_NAME_FOOTER_FILLBMP_SIZE_Y "FooterFillBitmapSizeY"
+#define UNO_NAME_FOOTER_FILLBMP_STRETCH "FooterFillBitmapStretch"
+#define UNO_NAME_FOOTER_FILLBMP_TILE "FooterFillBitmapTile"
+#define UNO_NAME_FOOTER_FILLBMP_MODE "FooterFillBitmapMode"
+#define UNO_NAME_FOOTER_FILLCOLOR "FooterFillColor"
+#define UNO_NAME_FOOTER_FILLBACKGROUND "FooterFillBackground"
+#define UNO_NAME_FOOTER_FILLBITMAP "FooterFillBitmap"
+#define UNO_NAME_FOOTER_FILLBITMAPNAME "FooterFillBitmapName"
+#define UNO_NAME_FOOTER_FILLBITMAPURL "FooterFillBitmapURL"
+#define UNO_NAME_FOOTER_FILLGRADIENTSTEPCOUNT "FooterFillGradientStepCount"
+#define UNO_NAME_FOOTER_FILLGRADIENT "FooterFillGradient"
+#define UNO_NAME_FOOTER_FILLGRADIENTNAME "FooterFillGradientName"
+#define UNO_NAME_FOOTER_FILLHATCH "FooterFillHatch"
+#define UNO_NAME_FOOTER_FILLHATCHNAME "FooterFillHatchName"
+#define UNO_NAME_FOOTER_FILLSTYLE "FooterFillStyle"
+#define UNO_NAME_FOOTER_FILL_TRANSPARENCE "FooterFillTransparence"
+#define UNO_NAME_FOOTER_FILLTRANSPARENCEGRADIENT "FooterFillTransparenceGradient"
+#define UNO_NAME_FOOTER_FILLTRANSPARENCEGRADIENTNAME "FooterFillTransparenceGradientName"
+#define UNO_NAME_FOOTER_FILLCOLOR_2 "FooterFillColor2"
#define UNO_NAME_PARA_STYLEHEADING "ParaStyleHeading"
#define UNO_NAME_PARA_STYLELEVEL1 "ParaStyleLevel1"
commit 4e58e7b857b452d75fdc96bf2ece76e76c3a8446
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Jul 2 17:02:34 2014 +0200
FN_UNO_FIRST_SHARE_CONTENT replaced by SID_ATTR_PAGE_SHARED_FIRST
Change-Id: Ic32229d57a7e3b3a7b27e56f8ac0dcfdda8f4f26
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index fd119ce..3c036ba 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -600,7 +600,6 @@
#define FN_MATH_BASELINE_ALIGNMENT (FN_EXTRA2 + 115)
#define FN_EMBEDDED_OBJECT (FN_EXTRA2 + 116)
-#define FN_UNO_FIRST_SHARE_CONTENT (FN_EXTRA2 + 117)
#define FN_UNO_HEADER_FIRST (FN_EXTRA2 + 118)
#define FN_UNO_FOOTER_FIRST (FN_EXTRA2 + 119)
#define FN_UNO_TABLE_BORDER2 (FN_EXTRA2 + 120)
More information about the Libreoffice-commits
mailing list