summaryrefslogtreecommitdiff
path: root/svx/source/unodraw
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/unodraw')
-rw-r--r--svx/source/unodraw/UnoNamespaceMap.cxx4
-rw-r--r--svx/source/unodraw/unobrushitemhelper.cxx4
-rw-r--r--svx/source/unodraw/unoprov.cxx60
-rw-r--r--svx/source/unodraw/unoshap3.cxx2
-rw-r--r--svx/source/unodraw/unoshape.cxx2
5 files changed, 36 insertions, 36 deletions
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index aa905c7ea754..33e90b738627 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -73,14 +73,14 @@ namespace svx
return static_cast<XWeak*>(new NamespaceMap( pWhichIds, pPool ));
}
- Sequence< OUString > NamespaceMap_getSupportedServiceNames()
+ static Sequence< OUString > NamespaceMap_getSupportedServiceNames()
throw()
{
Sequence<OUString> aSupportedServiceNames { "com.sun.star.xml.NamespaceMap" };
return aSupportedServiceNames;
}
- OUString NamespaceMap_getImplementationName()
+ static OUString NamespaceMap_getImplementationName()
throw()
{
return OUString( "com.sun.star.comp.Svx.NamespaceMap" );
diff --git a/svx/source/unodraw/unobrushitemhelper.cxx b/svx/source/unodraw/unobrushitemhelper.cxx
index 60f4c14cd52e..fe4d636a55a4 100644
--- a/svx/source/unodraw/unobrushitemhelper.cxx
+++ b/svx/source/unodraw/unobrushitemhelper.cxx
@@ -152,7 +152,7 @@ void setSvxBrushItemAsFillAttributesToTargetSet(const SvxBrushItem& rBrush, SfxI
}
}
-sal_uInt16 getTransparenceForSvxBrushItem(const SfxItemSet& rSourceSet, bool bSearchInParents)
+static sal_uInt16 getTransparenceForSvxBrushItem(const SfxItemSet& rSourceSet, bool bSearchInParents)
{
sal_uInt16 nFillTransparence(rSourceSet.Get(XATTR_FILLTRANSPARENCE, bSearchInParents).GetValue());
const SfxPoolItem* pGradientItem = nullptr;
@@ -171,7 +171,7 @@ sal_uInt16 getTransparenceForSvxBrushItem(const SfxItemSet& rSourceSet, bool bSe
return nFillTransparence;
}
-SvxBrushItem getSvxBrushItemForSolid(const SfxItemSet& rSourceSet, bool bSearchInParents, sal_uInt16 nBackgroundID)
+static SvxBrushItem getSvxBrushItemForSolid(const SfxItemSet& rSourceSet, bool bSearchInParents, sal_uInt16 nBackgroundID)
{
Color aFillColor(rSourceSet.Get(XATTR_FILLCOLOR, bSearchInParents).GetColorValue());
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 0d6c32e8a0cf..492c92a5eeb3 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::beans::PropertyAttribute;
using ::com::sun::star::drawing::TextVerticalAdjust;
-SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap()
{
static SfxItemPropertyMapEntry const aShapePropertyMap_Impl[] =
{
@@ -73,7 +73,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxShapePropertyMap()
return aShapePropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap()
{
static SfxItemPropertyMapEntry const aTextShapePropertyMap_Impl[] =
{
@@ -96,7 +96,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxTextShapePropertyMap()
return aTextShapePropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap()
{
static SfxItemPropertyMapEntry const aConnectorPropertyMap_Impl[] =
{
@@ -120,7 +120,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxConnectorPropertyMap()
return aConnectorPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap()
{
static SfxItemPropertyMapEntry const aDimensioningPropertyMap_Impl[] =
{
@@ -144,7 +144,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxDimensioningPropertyMap()
return aDimensioningPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap()
{
static SfxItemPropertyMapEntry const aCirclePropertyMap_Impl[] =
{
@@ -168,7 +168,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxCirclePropertyMap()
return aCirclePropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap()
{
static SfxItemPropertyMapEntry const aPolyPolygonPropertyMap_Impl[] =
{
@@ -194,7 +194,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxPolyPolygonPropertyMap()
return aPolyPolygonPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap()
{
static SfxItemPropertyMapEntry const aGraphicObjectPropertyMap_Impl[] =
{
@@ -225,7 +225,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxGraphicObjectPropertyMap()
return aGraphicObjectPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvx3DSceneObjectPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvx3DSceneObjectPropertyMap()
{
static SfxItemPropertyMapEntry const a3DSceneObjectPropertyMap_Impl[] =
{
@@ -243,7 +243,7 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DSceneObjectPropertyMap()
return a3DSceneObjectPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap()
{
static SfxItemPropertyMapEntry const a3DCubeObjectPropertyMap_Impl[] =
{
@@ -264,7 +264,7 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DCubeObjectPropertyMap()
return a3DCubeObjectPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap()
{
static SfxItemPropertyMapEntry const a3DSphereObjectPropertyMap_Impl[] =
{
@@ -284,7 +284,7 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DSphereObjectPropertyMap()
return a3DSphereObjectPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap()
{
static SfxItemPropertyMapEntry const a3DLatheObjectPropertyMap_Impl[] =
{
@@ -310,7 +310,7 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DLatheObjectPropertyMap()
return a3DLatheObjectPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap()
{
static SfxItemPropertyMapEntry const a3DExtrudeObjectPropertyMap_Impl[] =
{
@@ -336,7 +336,7 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DExtrudeObjectPropertyMap()
return a3DExtrudeObjectPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap()
{
static SfxItemPropertyMapEntry const a3DPolygonObjectPropertyMap_Impl[] =
{
@@ -357,7 +357,7 @@ SfxItemPropertyMapEntry const * ImplGetSvx3DPolygonObjectPropertyMap()
return a3DPolygonObjectPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap()
{
static SfxItemPropertyMapEntry const aAllPropertyMap_Impl[] =
{
@@ -399,7 +399,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxAllPropertyMap()
return aAllPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxGroupPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxGroupPropertyMap()
{
static SfxItemPropertyMapEntry const aGroupPropertyMap_Impl[] =
{
@@ -412,7 +412,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxGroupPropertyMap()
return aGroupPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap()
{
static SfxItemPropertyMapEntry const aOle2PropertyMap_Impl[] =
{
@@ -445,7 +445,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap()
return aOle2PropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap()
{
static SfxItemPropertyMapEntry const aPluginPropertyMap_Impl[] =
{
@@ -475,7 +475,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap()
return aPluginPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap()
{
//TODO/LATER: new properties for ScrollingMode and DefaultBorder
static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] =
@@ -509,7 +509,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap()
return aFramePropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap()
{
static SfxItemPropertyMapEntry const aAppletPropertyMap_Impl[] =
{
@@ -542,7 +542,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap()
return aAppletPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap()
{
static SfxItemPropertyMapEntry const aControlPropertyMap_Impl[] =
{
@@ -599,7 +599,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap()
return aControlPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap()
{
static SfxItemPropertyMapEntry const aPageShapePropertyMap_Impl[] =
{
@@ -622,7 +622,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap()
return aPageShapePropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap()
{
static SfxItemPropertyMapEntry const aCaptionPropertyMap_Impl[] =
{
@@ -656,7 +656,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap()
return aCaptionPropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap()
{
static SfxItemPropertyMapEntry const aCustomShapePropertyMap_Impl[] =
{
@@ -679,7 +679,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap()
return aCustomShapePropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap()
{
static SfxItemPropertyMapEntry const aMediaShapePropertyMap_Impl[] =
{
@@ -711,7 +711,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap()
return aMediaShapePropertyMap_Impl;
}
-SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap()
+static SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap()
{
static SfxItemPropertyMapEntry const aTableShapePropertyMap_Impl[] =
{
@@ -742,7 +742,7 @@ SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap()
return aTableShapePropertyMap_Impl;
}
-comphelper::PropertyMapEntry const * ImplGetSvxDrawingDefaultsPropertyMap()
+static comphelper::PropertyMapEntry const * ImplGetSvxDrawingDefaultsPropertyMap()
{
static comphelper::PropertyMapEntry const aSvxDrawingDefaultsPropertyMap_Impl[] =
{
@@ -762,7 +762,7 @@ comphelper::PropertyMapEntry const * ImplGetSvxDrawingDefaultsPropertyMap()
return aSvxDrawingDefaultsPropertyMap_Impl;
}
-comphelper::PropertyMapEntry const * ImplGetAdditionalWriterDrawingDefaultsPropertyMap()
+static comphelper::PropertyMapEntry const * ImplGetAdditionalWriterDrawingDefaultsPropertyMap()
{
static comphelper::PropertyMapEntry const aSvxAdditionalDefaultsPropertyMap_Impl[] =
{
@@ -1467,7 +1467,7 @@ static const char* RID_SVXSTR_TRASNGR[] =
RID_SVXSTR_TRASNGR0
};
-bool SvxUnoGetResourceRanges( const sal_uInt16 nWhich, const char**& pApiResIds, const char**& pIntResIds, int& nCount ) throw()
+static bool SvxUnoGetResourceRanges( const sal_uInt16 nWhich, const char**& pApiResIds, const char**& pIntResIds, int& nCount ) throw()
{
switch( nWhich )
{
@@ -1514,7 +1514,7 @@ bool SvxUnoGetResourceRanges( const sal_uInt16 nWhich, const char**& pApiResIds,
}
/// @throws std::exception
-bool SvxUnoConvertResourceString(const char **pSourceResIds, const char** pDestResIds, int nCount, OUString& rString, bool bToApi)
+static bool SvxUnoConvertResourceString(const char **pSourceResIds, const char** pDestResIds, int nCount, OUString& rString, bool bToApi)
{
// first, calculate the search string length without an optional number after the name
sal_Int32 nLength = rString.getLength();
@@ -1749,7 +1749,7 @@ static const char* SvxUnoColorNameResId[] =
};
/// @throws std::exception
-bool SvxUnoConvertResourceStringBuiltIn(const char** pSourceResIds, const char** pDestResIds, int nCount, OUString& rString, bool bToApi)
+static bool SvxUnoConvertResourceStringBuiltIn(const char** pSourceResIds, const char** pDestResIds, int nCount, OUString& rString, bool bToApi)
{
//We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't
//replace "Red Hat 1" with the translation of Red :-)
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 4873ff2dc0cb..0e487d0c7888 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -649,7 +649,7 @@ Svx3DLatheObject::~Svx3DLatheObject() throw()
{
}
-bool PolyPolygonShape3D_to_B3dPolyPolygon(
+static bool PolyPolygonShape3D_to_B3dPolyPolygon(
const Any& rValue,
basegfx::B3DPolyPolygon& rResultPolygon,
bool bCorrectPolygon)
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 6f68c8611241..0bd7c77fb017 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -605,7 +605,7 @@ void SvxShape::ForceMetricTo100th_mm(basegfx::B2DHomMatrix& rB2DHomMatrix) const
}
}
-void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet,
+static void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet,
SfxItemSet& rSet, const uno::Reference< beans::XPropertySet >& xSet, const SfxItemPropertyMap* pMap )
{
if(rPropSet.AreThereOwnUsrAnys())