sd/inc/strmname.h | 8 +-
sd/source/core/sdpage.cxx | 4 -
sd/source/filter/eppt/pptx-epptbase.cxx | 2
sd/source/filter/eppt/pptx-epptooxml.cxx | 2
sd/source/filter/html/htmlex.cxx | 12 +--
sd/source/filter/xml/sdtransform.cxx | 6 -
sd/source/ui/animations/motionpathtag.cxx | 2
sd/source/ui/annotations/annotationtag.cxx | 2
sd/source/ui/controller/displaymodecontroller.cxx | 4 -
sd/source/ui/controller/slidelayoutcontroller.cxx | 8 +-
sd/source/ui/dlg/gluectrl.cxx | 2
sd/source/ui/framework/configuration/ConfigurationUpdater.cxx | 10 +--
sd/source/ui/framework/factories/BasicPaneFactory.cxx | 4 -
sd/source/ui/framework/factories/PresentationFactory.cxx | 2
sd/source/ui/framework/module/ModuleController.cxx | 4 -
sd/source/ui/framework/module/SlideSorterModule.cxx | 4 -
sd/source/ui/framework/module/ToolBarModule.cxx | 8 +-
sd/source/ui/framework/module/ViewTabBarModule.cxx | 6 -
sd/source/ui/func/fuoltext.cxx | 2
sd/source/ui/func/fusearch.cxx | 2
sd/source/ui/func/futext.cxx | 2
sd/source/ui/inc/OutlineView.hxx | 2
sd/source/ui/inc/ViewShell.hxx | 8 +-
sd/source/ui/presenter/PresenterTextView.cxx | 18 ++---
sd/source/ui/remotecontrol/BluetoothServiceRecord.hxx | 2
sd/source/ui/sidebar/LayoutMenu.cxx | 6 -
sd/source/ui/sidebar/MasterPagesSelector.cxx | 2
sd/source/ui/sidebar/PreviewValueSet.cxx | 4 -
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 2
sd/source/ui/sidebar/SlideBackground.hxx | 2
sd/source/ui/slideshow/showwin.cxx | 4 -
sd/source/ui/slideshow/slideshowimpl.cxx | 10 +--
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx | 2
sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 4 -
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 32
+++++-----
sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx | 2
sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 6 -
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 2
sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx | 8 +-
sd/source/ui/slidesorter/view/SlsTheme.cxx | 4 -
sd/source/ui/table/TableDesignPane.cxx | 16 ++---
sd/source/ui/tools/EventMultiplexer.cxx | 6 -
sd/source/ui/unoidl/DrawController.cxx | 2
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 2
sd/source/ui/unoidl/unoobj.cxx | 30 ++++-----
sd/source/ui/unoidl/unopage.cxx | 2
sd/source/ui/view/viewoverlaymanager.cxx | 6 -
47 files changed, 140 insertions(+), 140 deletions(-)
New commits:
commit 72fcc08ea042f660dba802f20714a7fe8e86e1a8
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jul 1 21:26:45 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 1 23:44:43 2020 +0200
Upcoming improved loplugin:staticanonymous -> redundantstatic: sd
Change-Id: I4a7a3771890e3b7f782954a1bdce9e55db99739c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97656
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h
index 724bd3987fa3..5af7cdd1fd36 100644
--- a/sd/inc/strmname.h
+++ b/sd/inc/strmname.h
@@ -23,12 +23,12 @@
#include <rtl/ustring.hxx>
// PowerPoint-Filter
-static const OUString pFilterPowerPoint97( "MS PowerPoint 97" );
-static const OUString pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage"
);
-static const OUString pFilterPowerPoint97AutoPlay( "MS PowerPoint 97 AutoPlay"
);
+const OUString pFilterPowerPoint97( "MS PowerPoint 97" );
+const OUString pFilterPowerPoint97Template( "MS PowerPoint 97 Vorlage" );
+const OUString pFilterPowerPoint97AutoPlay( "MS PowerPoint 97 AutoPlay" );
// XML content stream
-static const OUString pStarDrawXMLContent( "content.xml" );
+const OUString pStarDrawXMLContent( "content.xml" );
#endif // INCLUDED_SD_INC_STRMNAME_H
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 39b59ca30ed6..899912028ea2 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -888,11 +888,11 @@ void SdPage::CreateTitleAndLayout(bool bInit, bool
bCreate )
namespace {
-static const o3tl::enumarray<PageKind, char const *> PageKindVector = {
+const o3tl::enumarray<PageKind, char const *> PageKindVector = {
"PageKind::Standard", "PageKind::Notes", "PageKind::Handout"
};
-static const o3tl::enumarray<PresObjKind, const char*> PresObjKindVector = {
+const o3tl::enumarray<PresObjKind, const char*> PresObjKindVector = {
"PRESOBJ_NONE", "PRESOBJ_TITLE", "PRESOBJ_OUTLINE",
"PRESOBJ_TEXT" ,"PRESOBJ_GRAPHIC" , "PRESOBJ_OBJECT",
"PRESOBJ_CHART", "PRESOBJ_ORGCHART", "PRESOBJ_TABLE",
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx
b/sd/source/filter/eppt/pptx-epptbase.cxx
index 552816e83a14..a5d80a61a91f 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -68,7 +68,7 @@ using ::com::sun::star::uno::Exception;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::UNO_QUERY;
-static PHLayout const pPHLayout[] =
+PHLayout const pPHLayout[] =
{
{ EppLayout::TITLESLIDE, { 0x0d, 0x10, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00 }, 0x00, 0x0d, 0x10, true, true, false },
{ EppLayout::TITLEANDBODYSLIDE, { 0x0d, 0x0e, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00 }, 0x00, 0x0d, 0x0e, true, true, false },
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index d2fca1e919c7..428cfe6169e6 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -157,7 +157,7 @@ struct PPTXLayoutInfo
}
-static const PPTXLayoutInfo aLayoutInfo[LAYOUT_SIZE] =
+const PPTXLayoutInfo aLayoutInfo[LAYOUT_SIZE] =
{
{ 20, "Blank Slide", "blank" },
{ 0, "Title Slide", "tx" },
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 15f952e7ad55..2ef4f3d7978b 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -332,12 +332,12 @@ void lclAppendStyle(OUStringBuffer& aBuffer, const
OUString& aTag, const OUStrin
} // anonymous namespace
-static constexpr OUStringLiteral gaHTMLHeader(
+constexpr OUStringLiteral gaHTMLHeader(
"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01
Transitional//EN\"\r\n"
" \"http://www.w3.org/TR/html4/transitional.dtd\";>\r\n"
"<html>\r\n<head>\r\n" );
-static constexpr OUStringLiteral gaHTMLExtension =
STR_HTMLEXP_DEFAULT_EXTENSION;
+constexpr OUStringLiteral gaHTMLExtension = STR_HTMLEXP_DEFAULT_EXTENSION;
// constructor for the html export helper classes
HtmlExport::HtmlExport(
@@ -2224,7 +2224,7 @@ OUString const & HtmlExport::getDocumentTitle()
return mDocTitle;
}
-static const char JS_NavigateAbs[] =
+const char JS_NavigateAbs[] =
"function NavigateAbs( nPage )\r\n"
"{\r\n"
" frames[\"show\"].location.href = \"img\" + nPage + \".$EXT\";\r\n"
@@ -2244,7 +2244,7 @@ static const char JS_NavigateAbs[] =
" }\r\n"
"}\r\n\r\n";
-static const char JS_NavigateRel[] =
+const char JS_NavigateRel[] =
"function NavigateRel( nDelta )\r\n"
"{\r\n"
" var nPage = parseInt(nCurrentPage) + parseInt(nDelta);\r\n"
@@ -2254,14 +2254,14 @@ static const char JS_NavigateRel[] =
" }\r\n"
"}\r\n\r\n";
-static const char JS_ExpandOutline[] =
+const char JS_ExpandOutline[] =
"function ExpandOutline()\r\n"
"{\r\n"
" frames[\"navbar2\"].location.href = \"navbar4.$EXT\";\r\n"
" frames[\"outline\"].location.href = \"outline1.$EXT\";\r\n"
"}\r\n\r\n";
-static const char JS_CollapseOutline[] =
+const char JS_CollapseOutline[] =
"function CollapseOutline()\r\n"
"{\r\n"
" frames[\"navbar2\"].location.href = \"navbar3.$EXT\";\r\n"
diff --git a/sd/source/filter/xml/sdtransform.cxx
b/sd/source/filter/xml/sdtransform.cxx
index 4866b5563ca6..c928efe81e6a 100644
--- a/sd/source/filter/xml/sdtransform.cxx
+++ b/sd/source/filter/xml/sdtransform.cxx
@@ -81,9 +81,9 @@ void TransformOOo2xDocument( SdDrawDocument* pDocument )
}
}
-static const OUStringLiteral gsEnableNumbering( "enable-numbering" );
-static const OUStringLiteral gsTextNamespace(
"urn:oasis:names:tc:opendocument:xmlns:text:1.0" );
-static const OUStringLiteral gsTrue( "true" );
+const OUStringLiteral gsEnableNumbering( "enable-numbering" );
+const OUStringLiteral gsTextNamespace(
"urn:oasis:names:tc:opendocument:xmlns:text:1.0" );
+const OUStringLiteral gsTrue( "true" );
SdTransformOOo2xDocument::SdTransformOOo2xDocument( SdDrawDocument& rDocument )
: mrDocument( rDocument )
diff --git a/sd/source/ui/animations/motionpathtag.cxx
b/sd/source/ui/animations/motionpathtag.cxx
index 75cd52b55f39..4c5226fcf8c6 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -65,7 +65,7 @@ namespace sd
{
const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32;
-static const int DRGPIX = 2; // Drag MinMove
in Pixel
+const int DRGPIX = 2; // Drag MinMove in
Pixel
namespace {
diff --git a/sd/source/ui/annotations/annotationtag.cxx
b/sd/source/ui/annotations/annotationtag.cxx
index 68a3e9a73efc..4e1cd4504791 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -52,7 +52,7 @@ namespace sd
{
const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32;
-static const int DRGPIX = 2; // Drag MinMove
in Pixel
+const int DRGPIX = 2; // Drag MinMove in
Pixel
static OUString getInitials( const OUString& rName )
{
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx
b/sd/source/ui/controller/displaymodecontroller.cxx
index c68e61c893d4..c48f5d635ce9 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -80,7 +80,7 @@ struct snewfoil_value_info
}
-static const snewfoil_value_info editmodes[] =
+const snewfoil_value_info editmodes[] =
{
{1,
BMP_DISPLAYMODE_SLIDE,
@@ -101,7 +101,7 @@ static const snewfoil_value_info editmodes[] =
{0, "", nullptr, "" }
};
-static const snewfoil_value_info mastermodes[] =
+const snewfoil_value_info mastermodes[] =
{
{5,
BMP_DISPLAYMODE_SLIDE_MASTER,
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx
b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 2109c08ba888..82a2e9bd21e3 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -84,13 +84,13 @@ struct snewfoil_value_info_layout
}
-static const snewfoil_value_info_layout notes[] =
+const snewfoil_value_info_layout notes[] =
{
{BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, AUTOLAYOUT_NOTES},
{nullptr, nullptr, AUTOLAYOUT_NONE},
};
-static const snewfoil_value_info_layout handout[] =
+const snewfoil_value_info_layout handout[] =
{
{BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, AUTOLAYOUT_HANDOUT1},
{BMP_FOILH_02, STR_AUTOLAYOUT_HANDOUT2, AUTOLAYOUT_HANDOUT2},
@@ -101,7 +101,7 @@ static const snewfoil_value_info_layout handout[] =
{nullptr, nullptr, AUTOLAYOUT_NONE},
};
-static const snewfoil_value_info_layout standard[] =
+const snewfoil_value_info_layout standard[] =
{
{BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, AUTOLAYOUT_NONE
},
{BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE,
AUTOLAYOUT_TITLE },
@@ -118,7 +118,7 @@ static const snewfoil_value_info_layout standard[] =
{nullptr, nullptr, AUTOLAYOUT_NONE}
};
-static const snewfoil_value_info_layout v_standard[] =
+const snewfoil_value_info_layout v_standard[] =
{
// vertical
{BMP_LAYOUT_VERTICAL02, STR_AL_VERT_TITLE_TEXT_CHART,
AUTOLAYOUT_VTITLE_VCONTENT_OVER_VCONTENT },
diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx
index cb27432added..a52df56c78e6 100644
--- a/sd/source/ui/dlg/gluectrl.cxx
+++ b/sd/source/ui/dlg/gluectrl.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::frame;
// at the moment, Joe only supports the methods specified below
#define ESCDIR_COUNT 5
-static const SdrEscapeDirection aEscDirArray[] =
+const SdrEscapeDirection aEscDirArray[] =
{
SdrEscapeDirection::SMART,
SdrEscapeDirection::LEFT,
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
index b7eccd19c610..6083757b4087 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
@@ -38,11 +38,11 @@ using ::sd::framework::FrameworkHelper;
using ::std::vector;
namespace {
-static const sal_Int32 snShortTimeout (100);
-static const sal_Int32 snNormalTimeout (1000);
-static const sal_Int32 snLongTimeout (10000);
-static const sal_Int32 snShortTimeoutCountThreshold (1);
-static const sal_Int32 snNormalTimeoutCountThreshold (5);
+const sal_Int32 snShortTimeout (100);
+const sal_Int32 snNormalTimeout (1000);
+const sal_Int32 snLongTimeout (10000);
+const sal_Int32 snShortTimeoutCountThreshold (1);
+const sal_Int32 snNormalTimeoutCountThreshold (5);
}
namespace sd::framework {
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index cf23c8947e4c..969981c2c7be 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -48,8 +48,8 @@ namespace {
LeftDrawPaneId
};
- static const sal_Int32 gnConfigurationUpdateStartEvent(0);
- static const sal_Int32 gnConfigurationUpdateEndEvent(1);
+ const sal_Int32 gnConfigurationUpdateStartEvent(0);
+ const sal_Int32 gnConfigurationUpdateEndEvent(1);
}
namespace sd::framework {
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx
b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 6b46e413fe2c..7384b8612fbb 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -86,7 +86,7 @@ private:
//===== PresentationFactory ===================================================
-static const char gsPresentationViewURL[] =
"private:resource/view/Presentation";
+const char gsPresentationViewURL[] = "private:resource/view/Presentation";
PresentationFactory::PresentationFactory (
const Reference<frame::XController>& rxController)
diff --git a/sd/source/ui/framework/module/ModuleController.cxx
b/sd/source/ui/framework/module/ModuleController.cxx
index bffbe4cd6f74..b18d9be163e7 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -36,8 +36,8 @@ using ::sd::tools::ConfigurationAccess;
namespace sd::framework {
-static const sal_uInt32 snFactoryPropertyCount (2);
-static const sal_uInt32 snStartupPropertyCount (1);
+const sal_uInt32 snFactoryPropertyCount (2);
+const sal_uInt32 snStartupPropertyCount (1);
class ModuleController::ResourceToFactoryMap
: public std::unordered_map<
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx
b/sd/source/ui/framework/module/SlideSorterModule.cxx
index 2f5d55b7eb84..1aa96bd0b2d4 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -37,8 +37,8 @@ using namespace ::com::sun::star::drawing::framework;
using ::sd::framework::FrameworkHelper;
namespace {
- static const sal_Int32 ResourceActivationRequestEvent = 0;
- static const sal_Int32 ResourceDeactivationRequestEvent = 1;
+ const sal_Int32 ResourceActivationRequestEvent = 0;
+ const sal_Int32 ResourceDeactivationRequestEvent = 1;
}
namespace sd::framework {
diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx
b/sd/source/ui/framework/module/ToolBarModule.cxx
index 75c1622b56d7..969a94f031c5 100644
--- a/sd/source/ui/framework/module/ToolBarModule.cxx
+++ b/sd/source/ui/framework/module/ToolBarModule.cxx
@@ -30,10 +30,10 @@ using namespace ::com::sun::star::drawing::framework;
using ::sd::framework::FrameworkHelper;
namespace {
- static const sal_Int32 gnConfigurationUpdateStartEvent(0);
- static const sal_Int32 gnConfigurationUpdateEndEvent(1);
- static const sal_Int32 gnResourceActivationRequestEvent(2);
- static const sal_Int32 gnResourceDeactivationRequestEvent(3);
+ const sal_Int32 gnConfigurationUpdateStartEvent(0);
+ const sal_Int32 gnConfigurationUpdateEndEvent(1);
+ const sal_Int32 gnResourceActivationRequestEvent(2);
+ const sal_Int32 gnResourceDeactivationRequestEvent(3);
}
namespace sd::framework {
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx
b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index 692a0ab5c349..994e09e816fd 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.cxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -35,9 +35,9 @@ using ::sd::framework::FrameworkHelper;
namespace {
-static const sal_Int32 ResourceActivationRequestEvent = 0;
-static const sal_Int32 ResourceDeactivationRequestEvent = 1;
-static const sal_Int32 ResourceActivationEvent = 2;
+const sal_Int32 ResourceActivationRequestEvent = 0;
+const sal_Int32 ResourceDeactivationRequestEvent = 1;
+const sal_Int32 ResourceActivationEvent = 2;
}
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index 2364f2c14d51..2314e3b75d33 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -40,7 +40,7 @@
namespace sd {
-static const sal_uInt16 SidArray[] = {
+const sal_uInt16 SidArray[] = {
SID_STYLE_FAMILY2,
SID_STYLE_FAMILY3,
SID_STYLE_FAMILY5,
diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx
index 9d12624c57bd..08eee2d9a76e 100644
--- a/sd/source/ui/func/fusearch.cxx
+++ b/sd/source/ui/func/fusearch.cxx
@@ -35,7 +35,7 @@ class SfxRequest;
namespace sd {
-static const sal_uInt16 SidArraySpell[] = {
+const sal_uInt16 SidArraySpell[] = {
SID_DRAWINGMODE,
SID_OUTLINE_MODE,
SID_SLIDE_SORTER_MODE,
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 51e5494ac697..ca22efc08780 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::linguistic2;
namespace sd {
-static const sal_uInt16 SidArray[] = {
+const sal_uInt16 SidArray[] = {
SID_STYLE_FAMILY2, // 5542
SID_STYLE_FAMILY5, // 5545
SID_REDO, // 5700
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 68aa3424a1ac..ec1e7fb9ec81 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -43,7 +43,7 @@ class DrawDocShell;
class OutlineViewShell;
class OutlineViewModelChangeGuard;
-static const int MAX_OUTLINERVIEWS = 4;
+const int MAX_OUTLINERVIEWS = 4;
/**
* Derivative of ::sd::View for the outline mode
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 47c71d0147c3..20f581e9f1ab 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -58,16 +58,16 @@ class ZoomList;
#undef OUTPUT_DRAWMODE_COLOR
#undef OUTPUT_DRAWMODE_CONTRAST
-static const DrawModeFlags OUTPUT_DRAWMODE_COLOR = DrawModeFlags::Default;
-static const DrawModeFlags OUTPUT_DRAWMODE_GRAYSCALE
+const DrawModeFlags OUTPUT_DRAWMODE_COLOR = DrawModeFlags::Default;
+const DrawModeFlags OUTPUT_DRAWMODE_GRAYSCALE
= DrawModeFlags::GrayLine | DrawModeFlags::GrayFill
| DrawModeFlags::BlackText | DrawModeFlags::GrayBitmap
| DrawModeFlags::GrayGradient;
-static const DrawModeFlags OUTPUT_DRAWMODE_BLACKWHITE
+const DrawModeFlags OUTPUT_DRAWMODE_BLACKWHITE
= DrawModeFlags::BlackLine | DrawModeFlags::BlackText
| DrawModeFlags::WhiteFill | DrawModeFlags::GrayBitmap
| DrawModeFlags::WhiteGradient;
-static const DrawModeFlags OUTPUT_DRAWMODE_CONTRAST
+const DrawModeFlags OUTPUT_DRAWMODE_CONTRAST
= DrawModeFlags::SettingsLine | DrawModeFlags::SettingsFill
| DrawModeFlags::SettingsText | DrawModeFlags::SettingsGradient;
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx
b/sd/source/ui/presenter/PresenterTextView.cxx
index 9f4deae5315f..3189bbc692a7 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -43,15 +43,15 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-static const OUStringLiteral gsTextPropertyName("Text");
-static const OUStringLiteral gsBitmapPropertyName("Bitmap");
-static const OUStringLiteral gsSizePropertyName("Size");
-static const OUStringLiteral gsBackgroundColorPropertyName("BackgroundColor");
-static const OUStringLiteral gsTextColorPropertyName("TextColor");
-static const OUStringLiteral gsFontDescriptorPropertyName("FontDescriptor");
-static const OUStringLiteral gsTopPropertyName("Top");
-static const OUStringLiteral gsTopRelativePropertyName("RelativeTop");
-static const OUStringLiteral gsTotalHeightPropertyName("TotalHeight");
+const OUStringLiteral gsTextPropertyName("Text");
+const OUStringLiteral gsBitmapPropertyName("Bitmap");
+const OUStringLiteral gsSizePropertyName("Size");
+const OUStringLiteral gsBackgroundColorPropertyName("BackgroundColor");
+const OUStringLiteral gsTextColorPropertyName("TextColor");
+const OUStringLiteral gsFontDescriptorPropertyName("FontDescriptor");
+const OUStringLiteral gsTopPropertyName("Top");
+const OUStringLiteral gsTopRelativePropertyName("RelativeTop");
+const OUStringLiteral gsTotalHeightPropertyName("TotalHeight");
namespace sd::presenter {
diff --git a/sd/source/ui/remotecontrol/BluetoothServiceRecord.hxx
b/sd/source/ui/remotecontrol/BluetoothServiceRecord.hxx
index 722f4f9d3d02..e34d2048e2d8 100644
--- a/sd/source/ui/remotecontrol/BluetoothServiceRecord.hxx
+++ b/sd/source/ui/remotecontrol/BluetoothServiceRecord.hxx
@@ -21,7 +21,7 @@
// for numbers see:
// https://www.bluetooth.org/Technical/AssignedNumbers/service_discovery.htm
-static const char * const bluetooth_service_record =
+const char * const bluetooth_service_record =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"<record>"
"<attribute id=\"0x0001\">" // Service class ID list
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx
b/sd/source/ui/sidebar/LayoutMenu.cxx
index 968f5dcf01f0..b163201d2f30 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -80,14 +80,14 @@ struct snewfoil_value_info
}
-static const snewfoil_value_info notes[] =
+const snewfoil_value_info notes[] =
{
{BMP_FOILN_01, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
AUTOLAYOUT_NOTES},
{"", nullptr, WritingMode_LR_TB, AUTOLAYOUT_NONE},
};
-static const snewfoil_value_info handout[] =
+const snewfoil_value_info handout[] =
{
{BMP_FOILH_01, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB,
AUTOLAYOUT_HANDOUT1},
@@ -104,7 +104,7 @@ static const snewfoil_value_info handout[] =
{"", nullptr, WritingMode_LR_TB, AUTOLAYOUT_NONE},
};
-static const snewfoil_value_info standard[] =
+const snewfoil_value_info standard[] =
{
{BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB,
AUTOLAYOUT_NONE},
{BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB,
AUTOLAYOUT_TITLE},
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx
b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 8c7e8d155ec2..f8847dbfc673 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -50,7 +50,7 @@ namespace sd::sidebar {
/** menu entry that is executed as default action when the left mouse
button is
clicked over a master page.
*/
-static const char gsDefaultClickAction[] = "applyselect";
+const char gsDefaultClickAction[] = "applyselect";
MasterPagesSelector::MasterPagesSelector (
vcl::Window* pParent,
diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx
b/sd/source/ui/sidebar/PreviewValueSet.cxx
index eda1eb4025a0..7b83669ceaae 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.cxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.cxx
@@ -22,8 +22,8 @@
namespace sd::sidebar {
-static const int gnBorderWidth(3);
-static const int gnBorderHeight(3);
+const int gnBorderWidth(3);
+const int gnBorderHeight(3);
PreviewValueSet::PreviewValueSet()
: ValueSet(nullptr)
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index 2bc048209582..bb170c0d845d 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -77,7 +77,7 @@ RecentlyUsedMasterPages& RecentlyUsedMasterPages::Instance()
return *mpInstance;
}
-static constexpr size_t gnMaxListSize(8);
+constexpr size_t gnMaxListSize(8);
RecentlyUsedMasterPages::RecentlyUsedMasterPages()
: maListeners(),
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx
b/sd/source/ui/sidebar/SlideBackground.hxx
index adc9e3bdc91b..5599c104c9a4 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -42,7 +42,7 @@ class XFillGradientItem;
class XFillBitmapItem;
class XFillHatchItem;
-static const long MINBODY = 284;
+const long MINBODY = 284;
namespace sd::sidebar {
diff --git a/sd/source/ui/slideshow/showwin.cxx
b/sd/source/ui/slideshow/showwin.cxx
index 2762342abdce..becc8b8ea4e2 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -42,8 +42,8 @@ using namespace ::com::sun::star;
namespace sd {
-static const sal_uInt64 HIDE_MOUSE_TIMEOUT = 10000;
-static const sal_uInt64 SHOW_MOUSE_TIMEOUT = 1000;
+const sal_uInt64 HIDE_MOUSE_TIMEOUT = 10000;
+const sal_uInt64 SHOW_MOUSE_TIMEOUT = 1000;
ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController,
vcl::Window* pParent )
: ::sd::Window( pParent )
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 03fbc17a10dc..92d6cdd65f80 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -109,7 +109,7 @@ namespace sd
{
/** Slots, which will be disabled in the slide show and are managed by Sfx.
Have to be sorted in the order of the SIDs */
-static sal_uInt16 const pAllowed[] =
+sal_uInt16 const pAllowed[] =
{
SID_OPENDOC , // 5501 ///< that
internally jumps work
SID_JUMPTOMARK , // 5598
@@ -479,9 +479,9 @@ void AnimationSlideController::displayCurrentSlide( const
Reference< XSlideShow
xShow->displaySlide( xSlide, xDrawPages, xAnimNode,
comphelper::containerToSequence(aProperties) );
}
-static constexpr OUStringLiteral gsOnClick( "OnClick" );
-static constexpr OUStringLiteral gsBookmark( "Bookmark" );
-static constexpr OUStringLiteral gsVerb( "Verb" );
+constexpr OUStringLiteral gsOnClick( "OnClick" );
+constexpr OUStringLiteral gsBookmark( "Bookmark" );
+constexpr OUStringLiteral gsVerb( "Verb" );
SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >&
xPresentation, ViewShell* pViewSh, ::sd::View* pView, SdDrawDocument* pDoc,
vcl::Window* pParentWindow )
: SlideshowImplBase( m_aMutex )
@@ -2303,7 +2303,7 @@ void SlideshowImpl::createSlideList( bool bAll, const
OUString& rPresSlide )
typedef sal_uInt16 (*FncGetChildWindowId)();
-static const FncGetChildWindowId aShowChildren[] =
+const FncGetChildWindowId aShowChildren[] =
{
&AnimationChildWindow::GetChildWindowId,
&Svx3DChildWindow::GetChildWindowId,
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index 871bac3833ce..9c9d029ea622 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -31,7 +31,7 @@
// previews that are currently not visible. The visible previews are all
// held in memory at all times. This default is used only when the
// configuration does not have a value.
-static const sal_Int32 MAXIMAL_CACHE_SIZE = 4*1024L*1024L;
+const sal_Int32 MAXIMAL_CACHE_SIZE = 4*1024L*1024L;
using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index cb3fb6f808d0..64613db12096 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -34,8 +34,8 @@
namespace sd::slidesorter::controller {
-static constexpr double gnHorizontalScrollFactor(0.15);
-static constexpr double gnVerticalScrollFactor(0.25);
+constexpr double gnHorizontalScrollFactor(0.15);
+constexpr double gnVerticalScrollFactor(0.25);
ScrollBarManager::ScrollBarManager (SlideSorter& rSlideSorter)
: mrSlideSorter(rSlideSorter),
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 272403364abe..e3daba4d98b3 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -55,28 +55,28 @@
#include <sdmod.hxx>
namespace {
-static const sal_uInt32 SINGLE_CLICK (0x00000001);
-static const sal_uInt32 DOUBLE_CLICK (0x00000002);
-static const sal_uInt32 LEFT_BUTTON (0x00000010);
-static const sal_uInt32 RIGHT_BUTTON (0x00000020);
-static const sal_uInt32 MIDDLE_BUTTON (0x00000040);
-static const sal_uInt32 BUTTON_DOWN (0x00000100);
-static const sal_uInt32 BUTTON_UP (0x00000200);
-static const sal_uInt32 MOUSE_MOTION (0x00000400);
-static const sal_uInt32 MOUSE_DRAG (0x00000800);
+const sal_uInt32 SINGLE_CLICK (0x00000001);
+const sal_uInt32 DOUBLE_CLICK (0x00000002);
+const sal_uInt32 LEFT_BUTTON (0x00000010);
+const sal_uInt32 RIGHT_BUTTON (0x00000020);
+const sal_uInt32 MIDDLE_BUTTON (0x00000040);
+const sal_uInt32 BUTTON_DOWN (0x00000100);
+const sal_uInt32 BUTTON_UP (0x00000200);
+const sal_uInt32 MOUSE_MOTION (0x00000400);
+const sal_uInt32 MOUSE_DRAG (0x00000800);
// The rest leaves the lower 16 bit untouched so that it can be used with
// key codes.
-static const sal_uInt32 OVER_SELECTED_PAGE (0x00010000);
-static const sal_uInt32 OVER_UNSELECTED_PAGE (0x00020000);
-static const sal_uInt32 SHIFT_MODIFIER (0x00200000);
-static const sal_uInt32 CONTROL_MODIFIER (0x00400000);
+const sal_uInt32 OVER_SELECTED_PAGE (0x00010000);
+const sal_uInt32 OVER_UNSELECTED_PAGE (0x00020000);
+const sal_uInt32 SHIFT_MODIFIER (0x00200000);
+const sal_uInt32 CONTROL_MODIFIER (0x00400000);
// Some absent events are defined so they can be expressed explicitly.
-static const sal_uInt32 NO_MODIFIER (0x00000000);
-static const sal_uInt32 NOT_OVER_PAGE (0x00000000);
+const sal_uInt32 NO_MODIFIER (0x00000000);
+const sal_uInt32 NOT_OVER_PAGE (0x00000000);
// Masks
-static const sal_uInt32 MODIFIER_MASK (SHIFT_MODIFIER |
CONTROL_MODIFIER);
+const sal_uInt32 MODIFIER_MASK (SHIFT_MODIFIER | CONTROL_MODIFIER);
} // end of anonymous namespace
diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
index a0f79f984d5e..10115eafcca2 100644
--- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
@@ -188,7 +188,7 @@ VisibleAreaManager::TemporaryDisabler::~TemporaryDisabler()
namespace {
-const static sal_Int32 gnMaxScrollDistance = 300;
+const sal_Int32 gnMaxScrollDistance = 300;
VisibleAreaScroller::VisibleAreaScroller (
SlideSorter& rSlideSorter,
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index ca059ec8d98d..6e44a7310eff 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -39,7 +39,7 @@
namespace {
-static const double gnPreviewOffsetScale = 1.0 / 8.0;
+const double gnPreviewOffsetScale = 1.0 / 8.0;
::tools::Rectangle GrowRectangle (const ::tools::Rectangle& rBox, const
sal_Int32 nOffset)
{
@@ -58,8 +58,8 @@ namespace sd::slidesorter::view {
//===== InsertionIndicatorOverlay ===========================================
-const static sal_Int32 gnShadowBorder = 3;
-const static sal_Int32 gnLayerIndex = 2;
+const sal_Int32 gnShadowBorder = 3;
+const sal_Int32 gnLayerIndex = 2;
InsertionIndicatorOverlay::InsertionIndicatorOverlay (SlideSorter&
rSlideSorter)
: mrSlideSorter(rSlideSorter),
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index c111f807be24..4ae4ecdeeb60 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -33,7 +33,7 @@
namespace sd::slidesorter::view {
namespace {
-static const sal_Int32 gnMaximumLayerCount = 8;
+const sal_Int32 gnMaximumLayerCount = 8;
class LayerInvalidator : public ILayerInvalidator
{
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
index a3a5206914da..6c90634e7c96 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx
@@ -30,10 +30,10 @@
namespace sd::slidesorter::view {
namespace {
-const static sal_Int32 gnLeftPageNumberOffset = 2;
-const static sal_Int32 gnRightPageNumberOffset = 5;
-const static sal_Int32 gnOuterBorderWidth = 5;
-const static sal_Int32 gnInfoAreaMinWidth = 26;
+const sal_Int32 gnLeftPageNumberOffset = 2;
+const sal_Int32 gnRightPageNumberOffset = 5;
+const sal_Int32 gnOuterBorderWidth = 5;
+const sal_Int32 gnInfoAreaMinWidth = 26;
}
PageObjectLayouter::PageObjectLayouter (
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx
b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index a20fc60c62e8..639bbac87660 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -29,8 +29,8 @@
namespace sd::slidesorter::view {
-const static Color Black(0x000000);
-const static Color White(0xffffff);
+const Color Black(0x000000);
+const Color White(0xffffff);
static Color ChangeLuminance (Color aColor, const int nValue)
{
diff --git a/sd/source/ui/table/TableDesignPane.cxx
b/sd/source/ui/table/TableDesignPane.cxx
index d8ff97b9dea4..afb36ff791cf 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -66,14 +66,14 @@ using namespace ::com::sun::star::ui;
namespace sd {
-static const sal_Int32 nPreviewColumns = 5;
-static const sal_Int32 nPreviewRows = 5;
-static const sal_Int32 nCellWidth = 12; // one pixel is shared with the next
cell!
-static const sal_Int32 nCellHeight = 7; // one pixel is shared with the next
cell!
-static const sal_Int32 nBitmapWidth = (nCellWidth * nPreviewColumns) -
(nPreviewColumns - 1);
-static const sal_Int32 nBitmapHeight = (nCellHeight * nPreviewRows) -
(nPreviewRows - 1);
-
-static const OUStringLiteral gPropNames[CB_COUNT] =
+const sal_Int32 nPreviewColumns = 5;
+const sal_Int32 nPreviewRows = 5;
+const sal_Int32 nCellWidth = 12; // one pixel is shared with the next cell!
+const sal_Int32 nCellHeight = 7; // one pixel is shared with the next cell!
+const sal_Int32 nBitmapWidth = (nCellWidth * nPreviewColumns) -
(nPreviewColumns - 1);
+const sal_Int32 nBitmapHeight = (nCellHeight * nPreviewRows) - (nPreviewRows -
1);
+
+const OUStringLiteral gPropNames[CB_COUNT] =
{
"UseFirstRowStyle",
"UseLastRowStyle",
diff --git a/sd/source/ui/tools/EventMultiplexer.cxx
b/sd/source/ui/tools/EventMultiplexer.cxx
index e5fe2d31f90c..d182a4cd7a9a 100644
--- a/sd/source/ui/tools/EventMultiplexer.cxx
+++ b/sd/source/ui/tools/EventMultiplexer.cxx
@@ -46,9 +46,9 @@ using ::sd::framework::FrameworkHelper;
class SdDrawDocument;
namespace {
-static const sal_Int32 ResourceActivationEvent = 0;
-static const sal_Int32 ResourceDeactivationEvent = 1;
-static const sal_Int32 ConfigurationUpdateEvent = 2;
+const sal_Int32 ResourceActivationEvent = 0;
+const sal_Int32 ResourceDeactivationEvent = 1;
+const sal_Int32 ConfigurationUpdateEvent = 2;
}
namespace sd::tools {
diff --git a/sd/source/ui/unoidl/DrawController.cxx
b/sd/source/ui/unoidl/DrawController.cxx
index a3d43b454d6d..d90806696769 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -205,7 +205,7 @@ OUString SAL_CALL DrawController::getImplementationName( )
return "DrawController" ;
}
-static const char ssServiceName[] =
"com.sun.star.drawing.DrawingDocumentDrawView";
+const char ssServiceName[] = "com.sun.star.drawing.DrawingDocumentDrawView";
sal_Bool SAL_CALL DrawController::supportsService (const OUString&
rsServiceName)
{
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index e30b28a740b1..8e67f3ff5792 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -275,7 +275,7 @@ void DocumentSettings::AssignURL( XPropertyListType t,
const Any* pValue,
*pOk = *pChanged = true;
}
-static struct {
+struct {
const char *pName;
XPropertyListType t;
} const aURLPropertyNames[] = {
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index f3fee3332659..201f25655efa 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -1057,21 +1057,21 @@ uno::Reference< container::XNameReplace > SAL_CALL
SdXShape::getEvents( )
return new SdUnoEventsAccess( this );
}
-static const OUStringLiteral gaStrOnClick( "OnClick" );
-static const OUStringLiteral gaStrServiceName( "com.sun.star.documents.Events"
);
-static const OUStringLiteral gaStrEventType( "EventType" );
-static const OUStringLiteral gaStrPresentation( "Presentation" );
-static const OUStringLiteral gaStrLibrary("Library");
-static const OUStringLiteral gaStrMacroName("MacroName");
-static const OUStringLiteral gaStrClickAction( "ClickAction" );
-static const OUStringLiteral gaStrBookmark( "Bookmark" );
-static const OUStringLiteral gaStrEffect( "Effect" );
-static const OUStringLiteral gaStrPlayFull( "PlayFull" );
-static const OUStringLiteral gaStrVerb( "Verb" );
-static const OUStringLiteral gaStrSoundURL( "SoundURL" );
-static const OUStringLiteral gaStrSpeed( "Speed" );
-static const OUStringLiteral gaStrStarBasic( "StarBasic" );
-static const OUStringLiteral gaStrScript( "Script" );
+const OUStringLiteral gaStrOnClick( "OnClick" );
+const OUStringLiteral gaStrServiceName( "com.sun.star.documents.Events" );
+const OUStringLiteral gaStrEventType( "EventType" );
+const OUStringLiteral gaStrPresentation( "Presentation" );
+const OUStringLiteral gaStrLibrary("Library");
+const OUStringLiteral gaStrMacroName("MacroName");
+const OUStringLiteral gaStrClickAction( "ClickAction" );
+const OUStringLiteral gaStrBookmark( "Bookmark" );
+const OUStringLiteral gaStrEffect( "Effect" );
+const OUStringLiteral gaStrPlayFull( "PlayFull" );
+const OUStringLiteral gaStrVerb( "Verb" );
+const OUStringLiteral gaStrSoundURL( "SoundURL" );
+const OUStringLiteral gaStrSpeed( "Speed" );
+const OUStringLiteral gaStrStarBasic( "StarBasic" );
+const OUStringLiteral gaStrScript( "Script" );
SdUnoEventsAccess::SdUnoEventsAccess( SdXShape* pShape ) throw()
: mpShape( pShape )
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 6f66b1958b8d..0ac52935250a 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -100,7 +100,7 @@ enum WID_PAGE
}
-static char const sEmptyPageName[sizeof("page")] = "page";
+char const sEmptyPageName[sizeof("page")] = "page";
// this function stores the property maps for draw pages in impress and draw
static const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress,
PageKind ePageKind )
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx
b/sd/source/ui/view/viewoverlaymanager.cxx
index 282f4aeb8e93..0485dde40f94 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -57,10 +57,10 @@ class ImageButtonHdl;
}
-static const sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE,
SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA };
+const sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM,
SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA };
static const char* gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART,
STR_INSERT_PICTURE, STR_INSERT_MOVIE };
-static const OUStringLiteral aSmallPlaceHolders[] =
+const OUStringLiteral aSmallPlaceHolders[] =
{
BMP_PLACEHOLDER_TABLE_SMALL,
BMP_PLACEHOLDER_CHART_SMALL,
@@ -72,7 +72,7 @@ static const OUStringLiteral aSmallPlaceHolders[] =
BMP_PLACEHOLDER_MOVIE_SMALL_HOVER
};
-static const OUStringLiteral aBigPlaceHolders[] =
+const OUStringLiteral aBigPlaceHolders[] =
{
BMP_PLACEHOLDER_TABLE_LARGE,
BMP_PLACEHOLDER_CHART_LARGE,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
