Rebased ref, commits from common ancestor:
commit d6ed69edd63ab49a38b08c580f3160e192f628c8
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Nov 2 18:14:10 2015 +0200
Fix some thinkos or copy-paste mistakes for glyphy
Change-Id: Ie008086c2a34081c9f50a61808b73b66eda58e2c
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e4e8b03..9cadb13 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -288,14 +288,14 @@ endef
endif # SYSTEM_GLEW
-$(eval $(call gb_Helper_register_packages_for_install,ooo,\
- liborcus \
-))
-
-ifneq ($(SYSTEM_GLEW),)
+ifneq ($(SYSTEM_GLYPHY),)
else # !SYSTEM_GLYPHY
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ glyphy \
+))
+
define gb_LinkTarget__use_glyphy
$(call gb_LinkTarget_use_package,$(1),glyphy)
@@ -310,7 +310,7 @@ $(call gb_LinkTarget_add_libs,$(1),\
endef
-endif GLYPHY
+endif # SYSTEM_GLYPHY
define gb_LinkTarget__use_iconv
$(call gb_LinkTarget_add_libs,$(1),-liconv)
diff --git a/config_host.mk.in b/config_host.mk.in
index 5b2e648..4c697d1 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -526,6 +526,7 @@ export SYSTEM_GENCCODE=@SYSTEM_GENCCODE@
export SYSTEM_GENCMN=@SYSTEM_GENCMN@
export SYSTEM_GLEW=@SYSTEM_GLEW@
export SYSTEM_GLM=@SYSTEM_GLM@
+export SYSTEM_GLYPHY=@SYSTEM_GLYPHY@
export SYSTEM_GRAPHITE=@SYSTEM_GRAPHITE@
export SYSTEM_HARFBUZZ=@SYSTEM_HARFBUZZ@
export SYSTEM_HSQLDB=@SYSTEM_HSQLDB@
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 9daf548..7c78c7d 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,FREETYPE,freetype) \
$(call gb_Helper_optional,GLEW,glew) \
$(call gb_Helper_optional,GLM,glm) \
+ $(call gb_Helper_optional,GLYPHY,glyphy) \
$(call gb_Helper_optional,GRAPHITE,graphite) \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,HSQLDB,hsqldb) \
diff --git a/external/glyphy/Module_glyphy.mk b/external/glyphy/Module_glyphy.mk
index 084c542..6228bba 100644
--- a/external/glyphy/Module_glyphy.mk
+++ b/external/glyphy/Module_glyphy.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,glyphy))
-$(eval $(call gb_Module_add_targets,liborcus,\
+$(eval $(call gb_Module_add_targets,glyphy,\
UnpackedTarball_glyphy \
))
commit a4ba55b06276575a40cedfe8199f0d653516ec2e
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Wed Oct 14 15:06:55 2015 +0200
link vcl against libglyphy
Change-Id: I5b206f5d857d28acda82ce8ac53f835142f46da2
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 27e008b..e4e8b03 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -288,6 +288,30 @@ endef
endif # SYSTEM_GLEW
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+ liborcus \
+))
+
+ifneq ($(SYSTEM_GLEW),)
+
+else # !SYSTEM_GLYPHY
+
+define gb_LinkTarget__use_glyphy
+$(call gb_LinkTarget_use_package,$(1),glyphy)
+
+$(call gb_LinkTarget_set_include,$(1),\
+ -I$(call gb_UnpackedTarball_get_dir,glyphy/include) \
+ $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+ -L$(call gb_UnpackedTarball_get_dir,glyphy)/src/.libs -lglyphy \
+)
+
+endef
+
+endif GLYPHY
+
define gb_LinkTarget__use_iconv
$(call gb_LinkTarget_add_libs,$(1),-liconv)
diff --git a/external/glyphy/ExternalPackage_glyphy.mk
b/external/glyphy/ExternalPackage_glyphy.mk
index 484590d..cbae840 100644
--- a/external/glyphy/ExternalPackage_glyphy.mk
+++ b/external/glyphy/ExternalPackage_glyphy.mk
@@ -11,4 +11,10 @@ $(eval $(call
gb_ExternalPackage_ExternalPackage,glyphy,glyphy))
$(eval $(call gb_ExternalPackage_use_external_project,glyphy,glyphy))
+ifeq ($(OS),MACOSX)
+$(eval $(call
gb_ExternalPackage_add_file,glyphy,$(LIBO_LIB_FOLDER)/libglyphy.dylib,src/.libs/libglyphy.dylib))
+else ifeq ($(DISABLE_DYNLOADING),)
+$(eval $(call
gb_ExternalPackage_add_file,glyphy,$(LIBO_LIB_FOLDER)/libglyphy.so.0,src/.libs/libglyphy.so.0.0.0))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 575a64f..c601f73 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -737,6 +737,10 @@ $(eval $(call gb_Library_add_libs,vcl,\
-lXext \
))
+$(eval $(call gb_Library_use_externals,vcl,\
+ glyphy \
+))
+
$(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/opengl/x11/X11DeviceInfo \
))
commit 9761a8d68b657211e381031ecc59b4fea6801219
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Tue Oct 13 00:11:13 2015 +0200
integrate glyphy into the build
The used glyphy is not directly the upstream version. We currently use a
patched version that allows to disable the build for the demos.
Change-Id: Ic03355e1ea8fbc56e57afa4f90a55741fe9a563a
diff --git a/Makefile.fetch b/Makefile.fetch
index 10317b3..8b2da4e 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -130,6 +130,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \
$(call fetch_Optional,GLEW,GLEW_TARBALL) \
$(call fetch_Optional,GLM,GLM_TARBALL) \
+ $(call fetch_Optional,GLYPHY,GLYPHY_TARBALL) \
$(call fetch_Optional_pack,GOOGLE_DOCS_EXTENSION_PACK) \
$(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \
$(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \
diff --git a/configure.ac b/configure.ac
index 4a2811d..cdfd41e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8753,6 +8753,11 @@ AS_IF([test "$with_system_glew" = "yes"],
[AC_DEFINE([HAVE_GLEW_1_12])])
dnl ===================================================================
+dnl Check for system glyphy
+dnl ===================================================================
+libo_CHECK_SYSTEM_MODULE([glyphy], [GLYPHY], [glyphy >= 0.12.0],
["-I${WORKDIR}/UnpackedTarball/glyphy/include"])
+
+dnl ===================================================================
dnl Check for system vigra
dnl ===================================================================
AC_MSG_CHECKING([which vigra to use])
diff --git a/download.lst b/download.lst
index 25542de..5f8a51f 100755
--- a/download.lst
+++ b/download.lst
@@ -52,6 +52,7 @@ export FREEHAND_TARBALL := libfreehand-0.1.1.tar.bz2
export FREETYPE_TARBALL :=
dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
export GLEW_TARBALL := 3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip
export GLM_TARBALL :=
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
+export GLYPHY_TARBALL := 5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2
export GRAPHITE_TARBALL :=
5c0c9ac0996fbb4a0e17780ff5441959-graphite2-minimal-1.3.4.tgz
export HARFBUZZ_MD5SUM := 0e27e531f4c4acff601ebff0957755c2
export HARFBUZZ_TARBALL := harfbuzz-0.9.40.tar.bz2
diff --git a/external/glyphy/ExternalPackage_glyphy.mk
b/external/glyphy/ExternalPackage_glyphy.mk
new file mode 100644
index 0000000..484590d
--- /dev/null
+++ b/external/glyphy/ExternalPackage_glyphy.mk
@@ -0,0 +1,14 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,glyphy,glyphy))
+
+$(eval $(call gb_ExternalPackage_use_external_project,glyphy,glyphy))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/glyphy/ExternalProject_glyphy.mk
b/external/glyphy/ExternalProject_glyphy.mk
new file mode 100644
index 0000000..1eda015
--- /dev/null
+++ b/external/glyphy/ExternalProject_glyphy.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,glyphy))
+
+$(eval $(call gb_ExternalProject_use_autoconf,glyphy,build))
+
+$(eval $(call gb_ExternalProject_register_targets,glyphy,\
+ build \
+))
+
+$(eval $(call gb_ExternalProject_use_externals,glyphy, \
+ glew \
+))
+
+$(call gb_ExternalProject_get_state_target,glyphy,build) :
+ $(call gb_ExternalProject_run,build,\
+ MAKE=$(MAKE) ./configure \
+ --with-pic \
+ $(if $(DISABLE_DYNLOADING), \
+ --enable-static --disable-shared \
+ , \
+ --enable-shared --disable-static \
+ ) \
+ $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
+ $(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO)
\
+ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
+ && $(if $(verbose),V=1) \
+ $(MAKE) \
+ )
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/glyphy/Makefile b/external/glyphy/Makefile
new file mode 100644
index 0000000..e4968cf
--- /dev/null
+++ b/external/glyphy/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/glyphy/Module_glyphy.mk b/external/glyphy/Module_glyphy.mk
new file mode 100644
index 0000000..084c542
--- /dev/null
+++ b/external/glyphy/Module_glyphy.mk
@@ -0,0 +1,21 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Module_Module,glyphy))
+
+$(eval $(call gb_Module_add_targets,liborcus,\
+ UnpackedTarball_glyphy \
+))
+
+$(eval $(call gb_Module_add_targets,glyphy,\
+ ExternalPackage_glyphy \
+ ExternalProject_glyphy \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/glyphy/UnpackedTarball_glyphy.mk
b/external/glyphy/UnpackedTarball_glyphy.mk
new file mode 100644
index 0000000..8e2244b
--- /dev/null
+++ b/external/glyphy/UnpackedTarball_glyphy.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,glyphy))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,glyphy,$(GLYPHY_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_set_patchlevel,glyphy,1))
+
+# vim: set noet sw=4 ts=4:
commit bcd8da6849780b9680963ef3313d14209a46e5fa
Author: Mihai Varga <mihai.va...@collabora.com>
Date: Mon Nov 2 16:52:48 2015 +0200
LOK: make use of MOUSEMOVE in calc
Change-Id: Ideb7bdabd86e95cf10c7f19f0900110b816970c2
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 27fe638..2e4bb66 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -624,6 +624,9 @@ void ScModelObj::postMouseEvent(int nType, int nX, int nY,
int nCount, int nButt
pGridWindow->EndTracking(TrackingEventFlags::DontCallHdl);
break;
+ case LOK_MOUSEEVENT_MOUSEMOVE:
+ pGridWindow->MouseMove(aEvent);
+ break;
default:
assert(false);
break;
commit 5654e8f2cfc3ae33da3eae366229b6cb862750bf
Author: Xisco Fauli <aniste...@gmail.com>
Date: Fri Oct 23 00:57:54 2015 +0200
SVG: add import test for tdf#87309
Change-Id: I0f899fbab73ae43e09ca2afc18d956f42ec8b0a7
Reviewed-on: https://gerrit.libreoffice.org/19537
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx
b/svgio/qa/cppunit/SvgImportTest.cxx
index d056053..4b87b50 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -38,6 +38,7 @@ class Test : public test::BootstrapFixture, public
XmlTestTools
void checkRectPrimitive(Primitive2DSequence& rPrimitive);
void testStyles();
+ void testTdf87309();
Primitive2DSequence parseSvg(const char* aSource);
@@ -47,6 +48,7 @@ public:
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testStyles);
+ CPPUNIT_TEST(testTdf87309);
CPPUNIT_TEST_SUITE_END();
};
@@ -118,6 +120,19 @@ void Test::testStyles()
CPPUNIT_ASSERT(arePrimitive2DSequencesEqual(aSequenceRect,
aSequenceRectWithStylesByGroup));
}
+void Test::testTdf87309()
+{
+ Primitive2DSequence aSequenceTdf87309 =
parseSvg("/svgio/qa/cppunit/data/tdf87309.svg");
+ CPPUNIT_ASSERT_EQUAL(1, (int)aSequenceTdf87309.getLength());
+
+ Primitive2dXmlDump dumper;
+ xmlDocPtr pDocument = dumper.dumpAndParse(aSequenceTdf87309);
+
+ CPPUNIT_ASSERT (pDocument);
+
+ assertXPath(pDocument, "/primitive2D/transform/polypolygoncolor", "color",
"#000000");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
}
diff --git a/svgio/qa/cppunit/data/tdf87309.svg
b/svgio/qa/cppunit/data/tdf87309.svg
new file mode 100644
index 0000000..af8a7df
--- /dev/null
+++ b/svgio/qa/cppunit/data/tdf87309.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<svg width="120" height="120" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink";>
+ <rect x="10" y="10" width="100" height="100" fill="currentColor"/>
+</svg>
\ No newline at end of file
commit 861b28b88909ec39fc83fccc0ab23d288128aa0e
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Nov 2 15:18:09 2015 +0100
sc lok: fix rounding errors with non-100% zoom
There were two problems here:
1) ScTabView::getRowColumnHeaders() did not expose twip values directly,
but used ScRow/ColBar::GetEntrySize(), which does a twip -> pixel
conversion, and then converted it back to twip. Avoid this unnecessary
roundtrip.
2) ScViewData::ToPixel() trunaces the resulting float to an integer, so
if the result is e.g. 67.7 pixels, then Calc handled that as 67, but
gtktiledviewer rounded that up to 68, resulting in non-matching headers
for the rendered tiles.
Change-Id: Ie6ed1ea923a423d1526eeb235b7b87106fd2f20b
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index c8395a3..3d6577d 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -256,7 +256,7 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget*
pDocView, GdkEventConfi
rWindow.m_pRowBar->m_aHeaders.clear();
for (boost::property_tree::ptree::value_type& rValue :
aTree.get_child("rows"))
{
- int nSize =
std::round(lok_doc_view_twip_to_pixel(LOK_DOC_VIEW(pDocView),
std::atof(rValue.second.get<std::string>("size").c_str())));
+ int nSize = lok_doc_view_twip_to_pixel(LOK_DOC_VIEW(pDocView),
std::atof(rValue.second.get<std::string>("size").c_str()));
Header aHeader(nSize, rValue.second.get<std::string>("text"));
rWindow.m_pRowBar->m_aHeaders.push_back(aHeader);
}
@@ -266,7 +266,7 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget*
pDocView, GdkEventConfi
rWindow.m_pColumnBar->m_aHeaders.clear();
for (boost::property_tree::ptree::value_type& rValue :
aTree.get_child("columns"))
{
- int nSize =
std::round(lok_doc_view_twip_to_pixel(LOK_DOC_VIEW(pDocView),
std::atof(rValue.second.get<std::string>("size").c_str())));
+ int nSize = lok_doc_view_twip_to_pixel(LOK_DOC_VIEW(pDocView),
std::atof(rValue.second.get<std::string>("size").c_str()));
Header aHeader(nSize, rValue.second.get<std::string>("text"));
rWindow.m_pColumnBar->m_aHeaders.push_back(aHeader);
}
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 744ccb0..d11133b 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2289,15 +2289,12 @@ OUString ScTabView::getRowColumnHeaders()
SCROW nEndRow = 0;
pDoc->GetTiledRenderingArea(aViewData.GetTabNo(), nEndCol, nEndRow);
- double nPPTX = aViewData.GetPPTX();
- double nPPTY = aViewData.GetPPTY();
-
boost::property_tree::ptree aRows;
for (SCROW nRow = 0; nRow <= nEndRow; ++nRow)
{
boost::property_tree::ptree aRow;
- sal_uInt16 nSize = pRowBar[SC_SPLIT_BOTTOM]->GetEntrySize(nRow);
- aRow.put("size", OString::number(nSize / nPPTY).getStr());
+ sal_uInt16 nSize = pDoc->GetOriginalHeight(nRow, aViewData.GetTabNo());
+ aRow.put("size", OString::number(nSize).getStr());
OUString aText = pRowBar[SC_SPLIT_BOTTOM]->GetEntryText(nRow);
aRow.put("text", aText.toUtf8().getStr());
aRows.push_back(std::make_pair("", aRow));
@@ -2307,8 +2304,8 @@ OUString ScTabView::getRowColumnHeaders()
for (SCCOL nCol = 0; nCol <= nEndCol; ++nCol)
{
boost::property_tree::ptree aCol;
- sal_uInt16 nSize = pColBar[SC_SPLIT_LEFT]->GetEntrySize(nCol);
- aCol.put("size", OString::number(nSize / nPPTX).getStr());
+ sal_uInt16 nSize = pDoc->GetColWidth(nCol, aViewData.GetTabNo());
+ aCol.put("size", OString::number(nSize).getStr());
OUString aText = pColBar[SC_SPLIT_LEFT]->GetEntryText(nCol);
aCol.put("text", aText.toUtf8().getStr());
aCols.push_back(std::make_pair("", aCol));
commit 901fa421e1d446408116d1fe2eb6f070b5946dc9
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Nov 2 14:59:07 2015 +0100
gtktiledviewer: show zoom in the status bar
Change-Id: I4ab00a269b0a8435a278f93e1d92d102a80c8506
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index db7beb4..c8395a3 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -83,6 +83,9 @@ class TiledWindow
public:
GtkWidget* m_pDocView;
GtkWidget* m_pStatusBar;
+ GtkWidget* m_pProgressBar;
+ GtkWidget* m_pStatusbarLabel;
+ GtkWidget* m_pZoomLabel;
GtkToolItem* m_pEnableEditing;
GtkToolItem* m_pBold;
GtkToolItem* m_pItalic;
@@ -114,6 +117,9 @@ public:
TiledWindow()
: m_pDocView(0),
m_pStatusBar(0),
+ m_pProgressBar(0),
+ m_pStatusbarLabel(0),
+ m_pZoomLabel(0),
m_pEnableEditing(0),
m_pBold(0),
m_pItalic(0),
@@ -373,6 +379,8 @@ static void changeZoom( GtkWidget* pButton, gpointer /*
pItem */ )
lok_doc_view_set_zoom( LOK_DOC_VIEW(pDocView), fZoom );
}
}
+ std::string aZoom = std::to_string(int(fZoom * 100)) + std::string("%");
+ gtk_label_set_text(GTK_LABEL(rWindow.m_pZoomLabel), aZoom.c_str());
}
/// User clicked on the button -> inform LOKDocView.
@@ -425,8 +433,9 @@ static void createView(GtkWidget* pButton, gpointer
/*pItem*/)
GtkWidget* pDocView =
lok_doc_view_new_from_widget(LOK_DOC_VIEW(rWindow.m_pDocView));
TiledWindow& rNewWindow = setupWidgetAndCreateWindow(pDocView);
- // Hide status bar that contains the unused progress bar.
- gtk_widget_hide(rNewWindow.m_pStatusBar);
+ // Hide the unused progress bar.
+ gtk_widget_show_all(rNewWindow.m_pStatusBar);
+ gtk_widget_hide(rNewWindow.m_pProgressBar);
}
/// Creates a new model, i.e. LOK init and document load, one view implicitly.
@@ -846,7 +855,8 @@ static void openDocumentCallback (GObject* source_object,
GAsyncResult* res, gpo
focusChain = g_list_append( focusChain, pDocView );
gtk_container_set_focus_chain ( GTK_CONTAINER (rWindow.m_pVBox),
focusChain );
- gtk_widget_hide(rWindow.m_pStatusBar);
+ gtk_widget_show_all(rWindow.m_pStatusBar);
+ gtk_widget_hide(rWindow.m_pProgressBar);
}
/// Creates the GtkWindow that has main widget as children and registers it in
the window map.
@@ -1086,15 +1096,22 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
gtk_container_add(GTK_CONTAINER(rWindow.m_pScrolledWindow),
rWindow.m_pDocView);
- GtkWidget* pProgressBar = gtk_progress_bar_new ();
- g_signal_connect(rWindow.m_pDocView, "load-changed",
G_CALLBACK(loadChanged), pProgressBar);
+ rWindow.m_pProgressBar = gtk_progress_bar_new ();
+ g_signal_connect(rWindow.m_pDocView, "load-changed",
G_CALLBACK(loadChanged), rWindow.m_pProgressBar);
GtkWidget* pStatusBar = gtk_statusbar_new();
rWindow.m_pStatusBar = pStatusBar;
gtk_container_forall(GTK_CONTAINER(pStatusBar),
removeChildrenFromStatusbar, pStatusBar);
gtk_container_add (GTK_CONTAINER(rWindow.m_pVBox), pStatusBar);
- gtk_container_add (GTK_CONTAINER(pStatusBar), pProgressBar);
- gtk_widget_set_hexpand(pProgressBar, true);
+ gtk_container_add (GTK_CONTAINER(pStatusBar), rWindow.m_pProgressBar);
+ gtk_widget_set_hexpand(rWindow.m_pProgressBar, true);
+
+ rWindow.m_pStatusbarLabel = gtk_label_new("");
+ gtk_widget_set_hexpand(rWindow.m_pStatusbarLabel, TRUE);
+ gtk_container_add(GTK_CONTAINER(pStatusBar), rWindow.m_pStatusbarLabel);
+
+ rWindow.m_pZoomLabel = gtk_label_new("100%");
+ gtk_container_add(GTK_CONTAINER(pStatusBar), rWindow.m_pZoomLabel);
gtk_widget_show_all(pWindow);
// Hide the findbar by default.
@@ -1103,6 +1120,9 @@ static GtkWidget* createWindow(TiledWindow& rWindow)
gtk_widget_hide(rWindow.m_pCornerButton->m_pDrawingArea);
gtk_widget_hide(rWindow.m_pRowBar->m_pDrawingArea);
gtk_widget_hide(rWindow.m_pColumnBar->m_pDrawingArea);
+ // Hide the non-progressbar children of the status bar by default.
+ gtk_widget_hide(rWindow.m_pStatusbarLabel);
+ gtk_widget_hide(rWindow.m_pZoomLabel);
g_aWindows[pWindow] = rWindow;
g_signal_connect(rWindow.m_pDocView, "configure-event",
G_CALLBACK(TiledRowColumnBar::docConfigureEvent), 0);
commit 97a392a0367ba138a259bf625e15dd1300d1d188
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 2 15:11:08 2015 +0200
fix build
after my commit 7408498de37be05159f84cf0c8116313d3c196df
"loplugin:stringconstant"
Change-Id: I1354207e1ecb6ebc76fcda3ed8eb8f369180eae8
diff --git a/framework/inc/macros/xserviceinfo.hxx
b/framework/inc/macros/xserviceinfo.hxx
index a41aa80..a465957 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -76,7 +76,7 @@ namespace framework{
\
OUString CLASS::impl_getStaticImplementationName()
\
{
\
- return IMPLEMENTATIONNAME;
\
+ return OUString(IMPLEMENTATIONNAME);
\
}
#define PRIVATE_DEFINE_XSERVICEINFO_OLDSTYLE( CLASS, XINTERFACECAST,
SERVICENAME, IMPLEMENTATIONNAME ) \
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx
b/framework/source/dispatch/popupmenudispatcher.cxx
index fbc3b7b..c53e5ed 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -98,7 +98,7 @@ css::uno::Sequence< OUString >
PopupMenuDispatcher::impl_getStaticSupportedServi
OUString PopupMenuDispatcher::impl_getStaticImplementationName()
{
- return IMPLEMENTATIONNAME_POPUPMENUDISPATCHER;
+ return OUString(IMPLEMENTATIONNAME_POPUPMENUDISPATCHER);
}
css::uno::Reference< css::uno::XInterface >
commit 9fbdb3d37fab7c8e0d6507807166c4de079d272f
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Mon Nov 2 15:06:27 2015 +0200
Fix popup menu IDs after .ui conversion
Change-Id: I8955bee3ac2bb7a757c1f70dd46141833a068517
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index a6c4f1b..3c8340b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2282,9 +2282,9 @@ void SvxMenuConfigPage::UpdateButtonStates()
m_pMoveUpButton->Enable( false );
m_pMoveDownButton->Enable( false );
- pPopup->EnableItem( ID_BEGIN_GROUP );
- pPopup->EnableItem( ID_RENAME, false );
- pPopup->EnableItem( ID_DELETE, false );
+ pPopup->EnableItem( "addseparator" );
+ pPopup->EnableItem( "modrename", false );
+ pPopup->EnableItem( "moddelete", false );
m_pDescriptionField->SetText("");
@@ -2302,17 +2302,17 @@ void SvxMenuConfigPage::UpdateButtonStates()
if ( pEntryData->IsSeparator() )
{
- pPopup->EnableItem( ID_DELETE );
- pPopup->EnableItem( ID_BEGIN_GROUP, false );
- pPopup->EnableItem( ID_RENAME, false );
+ pPopup->EnableItem( "moddelete" );
+ pPopup->EnableItem( "addseparator", false );
+ pPopup->EnableItem( "modrename", false );
m_pDescriptionField->SetText("");
}
else
{
- pPopup->EnableItem( ID_BEGIN_GROUP );
- pPopup->EnableItem( ID_DELETE );
- pPopup->EnableItem( ID_RENAME );
+ pPopup->EnableItem( "addseparator" );
+ pPopup->EnableItem( "moddelete" );
+ pPopup->EnableItem( "modrename" );
m_pDescriptionField->SetText(pEntryData->GetHelpText());
}
@@ -2391,9 +2391,9 @@ IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, SelectMenu,
ListBox&, void )
PopupMenu* pPopup = m_pModifyTopLevelButton->GetPopupMenu();
if ( pMenuData )
{
- pPopup->EnableItem( ID_DELETE, pMenuData->IsDeletable() );
- pPopup->EnableItem( ID_RENAME, pMenuData->IsRenamable() );
- pPopup->EnableItem( ID_MOVE, pMenuData->IsMovable() );
+ pPopup->EnableItem( "delete", pMenuData->IsDeletable() );
+ pPopup->EnableItem( "rename", pMenuData->IsRenamable() );
+ pPopup->EnableItem( "move", pMenuData->IsMovable() );
SvxEntries* pEntries = pMenuData->GetEntries();
SvxEntries::const_iterator iter = pEntries->begin();
commit c7e36de2389bc60036160f4c13e5c4f7fd3673c1
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 2 15:04:05 2015 +0200
loplugin:stringconstant
Change-Id: I736e0d63ed891aee1582844aff25b9bdacab8db9
diff --git a/connectivity/source/commontools/TTableHelper.cxx
b/connectivity/source/commontools/TTableHelper.cxx
index d54dffe..b33f6bf 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -271,7 +271,7 @@ void OTableHelper::refreshColumns()
aCatalog,
m_SchemaName,
m_Name,
- OUString("%")
+ "%"
) );
// collect the column names, together with their ordinal position
diff --git a/connectivity/source/commontools/dbtools.cxx
b/connectivity/source/commontools/dbtools.cxx
index 3380879..553d291 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -439,7 +439,7 @@ SharedConnection lcl_connectRowSet(const Reference<
XRowSet>& _rxRowSet, const R
}
else
xRowSetProps->setPropertyValue(
- OUString( "ActiveConnection" ),
+ "ActiveConnection",
makeAny( xConnection.getTyped() )
);
}
@@ -655,7 +655,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor(
const Reference< XConnect
// Now set the filter to a dummy restriction
which will result in an empty
// result set.
- xComposer->setFilter( OUString( "0=1" ) );
+ xComposer->setFilter( "0=1" );
sStatementToExecute = xComposer->getQuery( );
}
}
@@ -678,10 +678,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor(
const Reference< XConnect
try
{
if ( xStatementProps.is() )
- xStatementProps->setPropertyValue(
- OUString( "MaxRows" ),
- makeAny( sal_Int32( 0 ) )
- );
+ xStatementProps->setPropertyValue( "MaxRows",
makeAny( sal_Int32( 0 ) ) );
}
catch( const Exception& )
{
diff --git a/connectivity/source/commontools/dbtools2.cxx
b/connectivity/source/commontools/dbtools2.cxx
index c59a551..e8fc4fc 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -751,7 +751,7 @@ sal_Int32 getTablePrivileges(const Reference<
XDatabaseMetaData>& _xMetaData,
// Some drivers put a table privilege as soon as any column has the
privilege,
// some drivers only if all columns have the privilege.
// To unify the situation, collect column privileges here, too.
- Reference< XResultSet > xColumnPrivileges =
_xMetaData->getColumnPrivileges(aVal, _sSchema, _sTable, OUString("%"));
+ Reference< XResultSet > xColumnPrivileges =
_xMetaData->getColumnPrivileges(aVal, _sSchema, _sTable, "%");
Reference< XRow > xColumnCurrentRow(xColumnPrivileges, UNO_QUERY);
if ( xColumnCurrentRow.is() )
{
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx
b/connectivity/source/drivers/calc/CCatalog.cxx
index 36b3bfc..203e870 100644
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
@@ -42,7 +42,7 @@ void OCalcCatalog::refreshTables()
Sequence< OUString > aTypes;
OCalcConnection::ODocHolder
aDocHolder(static_cast<OCalcConnection*>(m_pConnection));
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- OUString("%"),OUString("%"),aTypes);
+ "%", "%", aTypes);
if(xResult.is())
{
diff --git a/connectivity/source/drivers/calc/CConnection.cxx
b/connectivity/source/drivers/calc/CConnection.cxx
index 71a3c97..245aefc 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -131,7 +131,7 @@ Reference< XSpreadsheetDocument>
OCalcConnection::acquireDoc()
try
{
xComponent = xDesktop->loadComponentFromURL(
- m_aFileName, OUString("_blank"), 0, aArgs );
+ m_aFileName, "_blank", 0, aArgs );
}
catch( const Exception& )
{
diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx
b/connectivity/source/drivers/dbase/DCatalog.cxx
index 4ff0d83..0c10788 100644
--- a/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/connectivity/source/drivers/dbase/DCatalog.cxx
@@ -41,7 +41,7 @@ void ODbaseCatalog::refreshTables()
TStringVector aVector;
Sequence< OUString > aTypes;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- OUString("%"),OUString("%"),aTypes);
+ "%", "%", aTypes);
if(xResult.is())
{
diff --git a/connectivity/source/drivers/file/FCatalog.cxx
b/connectivity/source/drivers/file/FCatalog.cxx
index 24cc230..9d9564b 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -56,7 +56,7 @@ void OFileCatalog::refreshTables()
TStringVector aVector;
Sequence< OUString > aTypes;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- OUString("%"),OUString("%"),aTypes);
+ "%", "%", aTypes);
fillNames(xResult,aVector);
if(m_pTables)
diff --git a/connectivity/source/drivers/file/FTable.cxx
b/connectivity/source/drivers/file/FTable.cxx
index 0ef5189..666e902 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -80,7 +80,7 @@ void OFileTable::refreshColumns()
{
TStringVector aVector;
Reference< XResultSet > xResult =
m_pConnection->getMetaData()->getColumns(Any(),
-
m_SchemaName,m_Name, OUString("%"));
+
m_SchemaName,m_Name, "%");
if(xResult.is())
{
diff --git a/connectivity/source/drivers/flat/ECatalog.cxx
b/connectivity/source/drivers/flat/ECatalog.cxx
index b686c40..1b3e227 100644
--- a/connectivity/source/drivers/flat/ECatalog.cxx
+++ b/connectivity/source/drivers/flat/ECatalog.cxx
@@ -42,7 +42,7 @@ void OFlatCatalog::refreshTables()
TStringVector aVector;
Sequence< OUString > aTypes;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- OUString("%"),OUString("%"),aTypes);
+ "%", "%", aTypes);
if(xResult.is())
{
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx
b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 09e55a2..d02033e 100644
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -44,8 +44,8 @@ OHCatalog::OHCatalog(const Reference< XConnection >&
_xConnection) : sdbcx::OCat
void OHCatalog::refreshObjects(const Sequence< OUString >&
_sKindOfObject,TStringVector& _rNames)
{
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- OUString("%"),
- OUString("%"),
+ "%",
+ "%",
_sKindOfObject);
fillNames(xResult,_rNames);
}
@@ -108,7 +108,7 @@ void OHCatalog::refreshUsers()
{
TStringVector aVector;
Reference< XStatement > xStmt = m_xConnection->createStatement( );
- Reference< XResultSet > xResult = xStmt->executeQuery(OUString("select
User from hsqldb.user group by User"));
+ Reference< XResultSet > xResult = xStmt->executeQuery("select User from
hsqldb.user group by User");
if ( xResult.is() )
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx
b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 89bf6b5..2a3c68a 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -155,7 +155,7 @@ namespace connectivity { namespace hsqldb
if ( !m_bReadOnly )
{
Reference< XStatement > xStmt(
m_xConnection->createStatement(), UNO_QUERY_THROW );
- xStmt->execute( OUString( "CHECKPOINT DEFRAG" ) );
+ xStmt->execute( "CHECKPOINT DEFRAG" );
}
}
catch(const Exception& )
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 2e4c756..ade5ae0 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -536,12 +536,12 @@ namespace connectivity
Reference<XStatement> xStmt = _xConnection->createStatement();
if ( xStmt.is() )
{
- Reference<XResultSet>
xRes(xStmt->executeQuery(OUString("SELECT COUNT(*) FROM
INFORMATION_SCHEMA.SYSTEM_SESSIONS WHERE USER_NAME ='SA'")),UNO_QUERY);
+ Reference<XResultSet> xRes(xStmt->executeQuery("SELECT
COUNT(*) FROM INFORMATION_SCHEMA.SYSTEM_SESSIONS WHERE USER_NAME ='SA'"),
UNO_QUERY);
Reference<XRow> xRow(xRes,UNO_QUERY);
if ( xRow.is() && xRes->next() )
bLastOne = xRow->getInt(1) == 1;
if ( bLastOne )
- xStmt->execute(OUString("SHUTDOWN"));
+ xStmt->execute("SHUTDOWN");
}
}
}
@@ -652,7 +652,7 @@ namespace connectivity
Reference< XStatement> xStmt =
xConnection->createStatement();
OSL_ENSURE( xStmt.is(), "ODriverDelegator::preCommit:
no statement!" );
if ( xStmt.is() )
- xStmt->execute( OUString( "SET WRITE_DELAY 0" )
);
+ xStmt->execute( "SET WRITE_DELAY 0" );
bool bPreviousAutoCommit =
xConnection->getAutoCommit();
xConnection->setAutoCommit( sal_False );
@@ -660,7 +660,7 @@ namespace connectivity
xConnection->setAutoCommit( bPreviousAutoCommit );
if ( xStmt.is() )
- xStmt->execute( OUString( "SET WRITE_DELAY 60" )
);
+ xStmt->execute( "SET WRITE_DELAY 60" );
}
}
catch(Exception&)
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx
b/connectivity/source/drivers/hsqldb/HUser.cxx
index 25e0ccd..7a45a51 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -112,7 +112,7 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const
OUString& objName, sal_In
Any aCatalog;
if ( !sCatalog.isEmpty() )
aCatalog <<= sCatalog;
- xRes =
xMeta->getColumnPrivileges(aCatalog,sSchema,sTable,OUString("%"));
+ xRes = xMeta->getColumnPrivileges(aCatalog,sSchema,sTable,"%");
}
break;
}
diff --git a/connectivity/source/drivers/mork/MCatalog.cxx
b/connectivity/source/drivers/mork/MCatalog.cxx
index 88d4c20..9a4e935 100644
--- a/connectivity/source/drivers/mork/MCatalog.cxx
+++ b/connectivity/source/drivers/mork/MCatalog.cxx
@@ -53,7 +53,7 @@ void OCatalog::refreshTables()
Sequence< OUString > aTypes(1);
aTypes[0] = "%";
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- OUString("%"),OUString("%"),aTypes);
+ "%", "%", aTypes);
if(xResult.is())
{
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx
b/connectivity/source/drivers/mysql/YCatalog.cxx
index 7801643..ab79da8 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -45,8 +45,8 @@ OMySQLCatalog::OMySQLCatalog(const Reference< XConnection >&
_xConnection) : OCa
void OMySQLCatalog::refreshObjects(const Sequence< OUString >&
_sKindOfObject,TStringVector& _rNames)
{
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- OUString("%"),
- OUString("%"),
+ "%",
+ "%",
_sKindOfObject);
fillNames(xResult,_rNames);
}
@@ -100,7 +100,7 @@ void OMySQLCatalog::refreshUsers()
{
TStringVector aVector;
Reference< XStatement > xStmt = m_xConnection->createStatement( );
- Reference< XResultSet > xResult = xStmt->executeQuery(OUString("SELECT
grantee FROM information_schema.user_privileges GROUP BY grantee"));
+ Reference< XResultSet > xResult = xStmt->executeQuery("SELECT grantee
FROM information_schema.user_privileges GROUP BY grantee");
if ( xResult.is() )
{
Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/mysql/YUser.cxx
b/connectivity/source/drivers/mysql/YUser.cxx
index 6c9a466..2e57ff2 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -112,7 +112,7 @@ void OMySQLUser::findPrivilegesAndGrantPrivileges(const
OUString& objName, sal_I
Any aCatalog;
if ( !sCatalog.isEmpty() )
aCatalog <<= sCatalog;
- xRes =
xMeta->getColumnPrivileges(aCatalog,sSchema,sTable,OUString("%"));
+ xRes = xMeta->getColumnPrivileges(aCatalog,sSchema,sTable,
"%");
}
break;
}
diff --git a/connectivity/source/manager/mdrivermanager.cxx
b/connectivity/source/manager/mdrivermanager.cxx
index a9fec05..cddcf29 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::container;
using namespace ::com::sun::star::logging;
using namespace ::osl;
-#define SERVICE_SDBC_DRIVER OUString("com.sun.star.sdbc.Driver")
+#define SERVICE_SDBC_DRIVER "com.sun.star.sdbc.Driver"
void throwNoSuchElementException() throw(NoSuchElementException)
{
commit 7408498de37be05159f84cf0c8116313d3c196df
Author: Noel Grandin <n...@peralex.com>
Date: Mon Nov 2 14:50:07 2015 +0200
loplugin:stringconstant
Change-Id: I865efc1884b82d430fe7df2e432d43f5425a83d4
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index 8d7bce5..f4ac1b1 100644
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
@@ -12,7 +12,7 @@
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
+ * License, Version 2.0 (the "License"; you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
@@ -24,29 +24,29 @@
namespace framework{
-#define DOCTYPE_ACCELERATORS DECLARE_ASCII("<!DOCTYPE
accel:acceleratorlist PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\"
\"accelerator.dtd\">")
+#define DOCTYPE_ACCELERATORS "<!DOCTYPE accel:acceleratorlist
PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"accelerator.dtd\">"
-#define ATTRIBUTE_TYPE_CDATA DECLARE_ASCII("CDATA")
+#define ATTRIBUTE_TYPE_CDATA "CDATA"
-#define XMLNS_XLINK DECLARE_ASCII("xlink")
+#define XMLNS_XLINK "xlink"
// same items with a name space alias
-#define AL_ELEMENT_ACCELERATORLIST DECLARE_ASCII("accel:acceleratorlist")
-#define AL_ELEMENT_ITEM DECLARE_ASCII("accel:item" )
+#define AL_ELEMENT_ACCELERATORLIST "accel:acceleratorlist"
+#define AL_ELEMENT_ITEM "accel:item"
-#define AL_XMLNS_ACCEL DECLARE_ASCII("xmlns:accel")
-#define AL_XMLNS_XLINK DECLARE_ASCII("xmlns:xlink")
+#define AL_XMLNS_ACCEL "xmlns:accel"
+#define AL_XMLNS_XLINK "xmlns:xlink"
-#define AL_ATTRIBUTE_URL DECLARE_ASCII("xlink:href" )
-#define AL_ATTRIBUTE_KEYCODE DECLARE_ASCII("accel:code" )
-#define AL_ATTRIBUTE_MOD_SHIFT DECLARE_ASCII("accel:shift")
-#define AL_ATTRIBUTE_MOD_MOD1 DECLARE_ASCII("accel:mod1" )
-#define AL_ATTRIBUTE_MOD_MOD2 DECLARE_ASCII("accel:mod2" )
-#define AL_ATTRIBUTE_MOD_MOD3 DECLARE_ASCII("accel:mod3" )
+#define AL_ATTRIBUTE_URL "xlink:href"
+#define AL_ATTRIBUTE_KEYCODE "accel:code"
+#define AL_ATTRIBUTE_MOD_SHIFT "accel:shift"
+#define AL_ATTRIBUTE_MOD_MOD1 "accel:mod1"
+#define AL_ATTRIBUTE_MOD_MOD2 "accel:mod2"
+#define AL_ATTRIBUTE_MOD_MOD3 "accel:mod3"
// same items with full qualified name space
-#define NS_XMLNS_ACCEL
DECLARE_ASCII("http://openoffice.org/2001/accel";)
-#define NS_XMLNS_XLINK
DECLARE_ASCII("http://www.w3.org/1999/xlink"; )
+#define NS_XMLNS_ACCEL "http://openoffice.org/2001/accel";
+#define NS_XMLNS_XLINK "http://www.w3.org/1999/xlink";
} // namespace framework
diff --git a/framework/inc/classes/protocolhandlercache.hxx
b/framework/inc/classes/protocolhandlercache.hxx
index 1071bd2..9537677 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -31,11 +31,11 @@
namespace framework{
-#define PACKAGENAME_PROTOCOLHANDLER
DECLARE_ASCII("Office.ProtocolHandler" ) /// name of
our configuration package
+#define PACKAGENAME_PROTOCOLHANDLER "Office.ProtocolHandler"
/// name of our configuration package
-#define CFG_PATH_SEPARATOR DECLARE_ASCII("/"
) /// separator for configuration paths
+#define CFG_PATH_SEPARATOR "/"
/// separator for configuration paths
-#define PROPERTY_PROTOCOLS DECLARE_ASCII("Protocols"
) /// properties of a protocol handler
+#define PROPERTY_PROTOCOLS "Protocols"
/// properties of a protocol handler
/**
Programmer can register his own services to handle different protocols.
diff --git a/framework/inc/classes/taskcreator.hxx
b/framework/inc/classes/taskcreator.hxx
index e51602d..57ca358 100644
--- a/framework/inc/classes/taskcreator.hxx
+++ b/framework/inc/classes/taskcreator.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_TASKCREATOR_HXX
#define INCLUDED_FRAMEWORK_INC_CLASSES_TASKCREATOR_HXX
-#include <macros/generic.hxx>
#include <general.h>
#include <com/sun/star/frame/XFramesSupplier.hpp>
diff --git a/framework/inc/dispatch/closedispatcher.hxx
b/framework/inc/dispatch/closedispatcher.hxx
index b7d8042..bf77143 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -22,7 +22,6 @@
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
-#include <macros/generic.hxx>
#include <stdtypes.h>
#include <general.h>
diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx
b/framework/inc/dispatch/dispatchinformationprovider.hxx
index ebfd832..169e289 100644
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX
#define INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <general.h>
diff --git a/framework/inc/dispatch/dispatchprovider.hxx
b/framework/inc/dispatch/dispatchprovider.hxx
index 8137a1d..d5a20d2 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -25,7 +25,6 @@
#include <threadhelp/transactionbase.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
-#include <macros/generic.hxx>
#include <stdtypes.h>
#include <com/sun/star/lang/XTypeProvider.hpp>
diff --git a/framework/inc/dispatch/interceptionhelper.hxx
b/framework/inc/dispatch/interceptionhelper.hxx
index a03dd35..3db9b6d 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_FRAMEWORK_INC_DISPATCH_INTERCEPTIONHELPER_HXX
#include <macros/xinterface.hxx>
-#include <macros/generic.hxx>
#include <general.h>
#include <com/sun/star/frame/XDispatchProviderInterception.hpp>
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx
b/framework/inc/dispatch/mailtodispatcher.hxx
index 4ffea6b..f3fb8ed 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_MAILTODISPATCHER_HXX
#define INCLUDED_FRAMEWORK_INC_DISPATCH_MAILTODISPATCHER_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
diff --git a/framework/inc/dispatch/menudispatcher.hxx
b/framework/inc/dispatch/menudispatcher.hxx
index a78c999..e3b5b78 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_FRAMEWORK_INC_DISPATCH_MENUDISPATCHER_HXX
#include <classes/taskcreator.hxx>
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <classes/menumanager.hxx>
diff --git a/framework/inc/dispatch/oxt_handler.hxx
b/framework/inc/dispatch/oxt_handler.hxx
index 3917bf8..874ea6a 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -23,7 +23,6 @@
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
-#include <macros/generic.hxx>
#include <general.h>
#include <stdtypes.h>
diff --git a/framework/inc/dispatch/servicehandler.hxx
b/framework/inc/dispatch/servicehandler.hxx
index 0b81cbb..bd75de8 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_SERVICEHANDLER_HXX
#define INCLUDED_FRAMEWORK_INC_DISPATCH_SERVICEHANDLER_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx
b/framework/inc/dispatch/startmoduledispatcher.hxx
index 93cbae7e..31ecb62 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -22,7 +22,6 @@
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
-#include <macros/generic.hxx>
#include <stdtypes.h>
#include <general.h>
diff --git a/framework/inc/dispatch/systemexec.hxx
b/framework/inc/dispatch/systemexec.hxx
index f8115ec..b14d4ff 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_SYSTEMEXEC_HXX
#define INCLUDED_FRAMEWORK_INC_DISPATCH_SYSTEMEXEC_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
diff --git a/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h
index d19af3b..c1d6e67 100644
--- a/framework/inc/dispatchcommands.h
+++ b/framework/inc/dispatchcommands.h
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_DISPATCHCOMMANDS_H
#define INCLUDED_FRAMEWORK_INC_DISPATCHCOMMANDS_H
-#include <macros/generic.hxx>
namespace framework{
diff --git a/framework/inc/general.h b/framework/inc/general.h
index bb7d81b..4ca92bf 100644
--- a/framework/inc/general.h
+++ b/framework/inc/general.h
@@ -20,8 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_GENERAL_H
#define INCLUDED_FRAMEWORK_INC_GENERAL_H
-#include <macros/generic.hxx>
-
/* Normally XInterface isn't used here ...
But we need it to be able to define namespace alias css to anything related
to ::com::sun::star
:-) */
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx
b/framework/inc/helper/dockingareadefaultacceptor.hxx
index 683f9b1..0fd863a 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_FRAMEWORK_INC_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX
#include <classes/framecontainer.hxx>
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
diff --git a/framework/inc/helper/ocomponentaccess.hxx
b/framework/inc/helper/ocomponentaccess.hxx
index 6056298..f499270 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTACCESS_HXX
#define INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTACCESS_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <general.h>
diff --git a/framework/inc/helper/ocomponentenumeration.hxx
b/framework/inc/helper/ocomponentenumeration.hxx
index 6b2acd7..e382537 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTENUMERATION_HXX
#define INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTENUMERATION_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <general.h>
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 8664dde..63f2d91 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_FRAMEWORK_INC_HELPER_OFRAMES_HXX
#include <classes/framecontainer.hxx>
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <general.h>
diff --git a/framework/inc/helper/statusindicator.hxx
b/framework/inc/helper/statusindicator.hxx
index b5ee0bf..7885fa9 100644
--- a/framework/inc/helper/statusindicator.hxx
+++ b/framework/inc/helper/statusindicator.hxx
@@ -25,7 +25,6 @@
#include <helper/statusindicatorfactory.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
-#include <macros/generic.hxx>
// include UNO interfaces
#include <com/sun/star/task/XStatusIndicator.hpp>
diff --git a/framework/inc/helper/statusindicatorfactory.hxx
b/framework/inc/helper/statusindicatorfactory.hxx
index adcab36..2067f16 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -29,7 +29,6 @@
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
-#include <macros/generic.hxx>
#include <general.h>
// include uno interfaces
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx
b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index 100a7b2..ff694c9 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX
#define INCLUDED_FRAMEWORK_INC_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
diff --git a/framework/inc/helper/uielementwrapperbase.hxx
b/framework/inc/helper/uielementwrapperbase.hxx
index 92473f8..f8d9b4f 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_HELPER_UIELEMENTWRAPPERBASE_HXX
#define INCLUDED_FRAMEWORK_INC_HELPER_UIELEMENTWRAPPERBASE_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
diff --git a/framework/inc/helper/vclstatusindicator.hxx
b/framework/inc/helper/vclstatusindicator.hxx
index a9fc012..d4907a3 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_HELPER_VCLSTATUSINDICATOR_HXX
#define INCLUDED_FRAMEWORK_INC_HELPER_VCLSTATUSINDICATOR_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <general.h>
diff --git a/framework/inc/macros/generic.hxx b/framework/inc/macros/generic.hxx
deleted file mode 100644
index d8ab361..0000000
--- a/framework/inc/macros/generic.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_FRAMEWORK_INC_MACROS_GENERIC_HXX
-#define INCLUDED_FRAMEWORK_INC_MACROS_GENERIC_HXX
-
-#include <rtl/ustring.hxx>
-#include <rtl/textenc.h>
-
-// generic macros
-
-/*_________________________________________________________________________________________________________________
- DECLARE_ASCII( SASCIIVALUE )
-
- Use it to declare a constant ascii value at compile time in code.
- zB. OUSting sTest = DECLARE_ASCII( "Test" )
-_________________________________________________________________________________________________________________*/
-
-#define DECLARE_ASCII( SASCIIVALUE )
\
- OUString( SASCIIVALUE )
-
-#endif // INCLUDED_FRAMEWORK_INC_MACROS_GENERIC_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index 5acc4b0..7faa55a 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_PROPERTIES_H
#define INCLUDED_FRAMEWORK_INC_PROPERTIES_H
-#include <macros/generic.hxx>
#include "general.h"
namespace framework{
@@ -33,12 +32,6 @@ namespace framework{
#define FRAME_PROPNAME_ASCII_TITLE "Title"
#define FRAME_PROPNAME_ASCII_INDICATORINTERCEPTION "IndicatorInterception"
-#define FRAME_PROPNAME_DISPATCHRECORDERSUPPLIER
DECLARE_ASCII(FRAME_PROPNAME_ASCII_DISPATCHRECORDERSUPPLIER)
-#define FRAME_PROPNAME_ISHIDDEN
DECLARE_ASCII(FRAME_PROPNAME_ASCII_ISHIDDEN )
-#define FRAME_PROPNAME_LAYOUTMANAGER
DECLARE_ASCII(FRAME_PROPNAME_ASCII_LAYOUTMANAGER )
-#define FRAME_PROPNAME_TITLE
DECLARE_ASCII(FRAME_PROPNAME_ASCII_TITLE )
-#define FRAME_PROPNAME_INDICATORINTERCEPTION
DECLARE_ASCII(FRAME_PROPNAME_ASCII_INDICATORINTERCEPTION )
-
// Please add new entries alphabetical sorted and correct all other handles!
// Start counting with 0, so it can be used as direct index into an array too.
// Don't forget updating of define FRAME_PROPCOUNT below!!!
@@ -58,12 +51,6 @@ namespace framework{
#define DESKTOP_PROPNAME_ASCII_SUSPENDQUICKSTARTVETO "SuspendQuickstartVeto"
#define DESKTOP_PROPNAME_ASCII_TITLE "Title"
-#define DESKTOP_PROPNAME_ACTIVEFRAME
DECLARE_ASCII(DESKTOP_PROPNAME_ASCII_ACTIVEFRAME )
-#define DESKTOP_PROPNAME_DISPATCHRECORDERSUPPLIER
DECLARE_ASCII(DESKTOP_PROPNAME_ASCII_DISPATCHRECORDERSUPPLIER)
-#define DESKTOP_PROPNAME_ISPLUGGED
DECLARE_ASCII(DESKTOP_PROPNAME_ASCII_ISPLUGGED )
-#define DESKTOP_PROPNAME_SUSPENDQUICKSTARTVETO
DECLARE_ASCII(DESKTOP_PROPNAME_ASCII_SUSPENDQUICKSTARTVETO )
-#define DESKTOP_PROPNAME_TITLE
DECLARE_ASCII(DESKTOP_PROPNAME_ASCII_TITLE )
-
// Please add new entries alphabetical sorted and correct all other handles!
// Start counting with 0, so it can be used as direct index into an array too.
// Don't forget updating of define DESKTOP_PROPCOUNT below!!!
@@ -112,7 +99,7 @@ namespace framework{
#define LAYOUTMANAGER_PROPNAME_ASCII_LOCKCOUNT "LockCount"
#define LAYOUTMANAGER_PROPNAME_ASCII_PRESERVE_CONTENT_SIZE
"PreserveContentSize"
-#define LAYOUTMANAGER_PROPNAME_MENUBARCLOSER OUString(
LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER )
+#define LAYOUTMANAGER_PROPNAME_MENUBARCLOSER
LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER
#define LAYOUTMANAGER_PROPNAME_AUTOMATICTOOLBARS OUString(
LAYOUTMANAGER_PROPNAME_ASCII_AUTOMATICTOOLBARS )
#define LAYOUTMANAGER_PROPNAME_REFRESHVISIBILITY OUString(
LAYOUTMANAGER_PROPNAME_ASCII_REFRESHVISIBILITY )
#define LAYOUTMANAGER_PROPNAME_HIDECURRENTUI OUString(
LAYOUTMANAGER_PROPNAME_ASCII_HIDECURRENTUI )
diff --git a/framework/inc/recording/dispatchrecorder.hxx
b/framework/inc/recording/dispatchrecorder.hxx
index 0c3389b..738a061 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -28,7 +28,6 @@
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
-#include <macros/generic.hxx>
#include <general.h>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx
b/framework/inc/recording/dispatchrecordersupplier.hxx
index 273dcf5..d49b459 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -23,7 +23,6 @@
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
-#include <macros/generic.hxx>
#include <general.h>
#include <stdtypes.h>
diff --git a/framework/inc/services.h b/framework/inc/services.h
index e7f8573..522a966 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -20,15 +20,13 @@
#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_H
#define INCLUDED_FRAMEWORK_INC_SERVICES_H
-#include <macros/generic.hxx>
-
namespace framework{
// used servicenames by framework
-#define SERVICENAME_FILTERFACTORY
DECLARE_ASCII("com.sun.star.document.FilterFactory" )
-#define SERVICENAME_CFGUPDATEACCESS
DECLARE_ASCII("com.sun.star.configuration.ConfigurationUpdateAccess") //
provides read/write access to the configuration
-#define SERVICENAME_CFGREADACCESS
DECLARE_ASCII("com.sun.star.configuration.ConfigurationAccess" ) //
provides readonly access to the configuration
+#define SERVICENAME_FILTERFACTORY
"com.sun.star.document.FilterFactory"
+#define SERVICENAME_CFGUPDATEACCESS
"com.sun.star.configuration.ConfigurationUpdateAccess" // provides read/write
access to the configuration
+#define SERVICENAME_CFGREADACCESS
"com.sun.star.configuration.ConfigurationAccess" // provides readonly
access to the configuration
#define SERVICENAME_CONTENTHANDLER
"com.sun.star.frame.ContentHandler"
#define SERVICENAME_JOB
"com.sun.star.task.Job"
#define SERVICENAME_PROTOCOLHANDLER
"com.sun.star.frame.ProtocolHandler"
@@ -39,29 +37,29 @@ namespace framework{
// used implementationnames by framework
-#define IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER
DECLARE_ASCII("com.sun.star.comp.framework.MediaTypeDetectionHelper")
-#define IMPLEMENTATIONNAME_OXT_HANDLER
DECLARE_ASCII("com.sun.star.comp.framework.OXTFileHandler" )
-#define IMPLEMENTATIONNAME_QUICKLAUNCHER
DECLARE_ASCII("com.sun.star.comp.desktop.QuickstartWrapper" )
-#define IMPLEMENTATIONNAME_DISPATCHRECORDERSUPPLIER
DECLARE_ASCII("com.sun.star.comp.framework.DispatchRecorderSupplier")
-#define IMPLEMENTATIONNAME_MAILTODISPATCHER
DECLARE_ASCII("com.sun.star.comp.framework.MailToDispatcher" )
-#define IMPLEMENTATIONNAME_SERVICEHANDLER
DECLARE_ASCII("com.sun.star.comp.framework.ServiceHandler" )
-#define IMPLEMENTATIONNAME_DISPATCHHELPER
DECLARE_ASCII("com.sun.star.comp.framework.services.DispatchHelper" )
-#define IMPLEMENTATIONNAME_MACROSMENUCONTROLLER
DECLARE_ASCII("com.sun.star.comp.framework.MacrosMenuController" )
-#define IMPLEMENTATIONNAME_FONTMENUCONTROLLER
DECLARE_ASCII("com.sun.star.comp.framework.FontMenuController" )
-#define IMPLEMENTATIONNAME_FONTSIZEMENUCONTROLLER
DECLARE_ASCII("com.sun.star.comp.framework.FontSizeMenuController" )
-#define IMPLEMENTATIONNAME_HEADERMENUCONTROLLER
DECLARE_ASCII("com.sun.star.comp.framework.HeaderMenuController" )
-#define IMPLEMENTATIONNAME_FOOTERMENUCONTROLLER
DECLARE_ASCII("com.sun.star.comp.framework.FooterMenuController" )
-#define IMPLEMENTATIONNAME_NEWMENUCONTROLLER
DECLARE_ASCII("com.sun.star.comp.framework.NewMenuController" )
-#define IMPLEMENTATIONNAME_TOOLBARSMENUCONTROLLER
DECLARE_ASCII("com.sun.star.comp.framework.ToolBarsMenuController" )
-#define IMPLEMENTATIONNAME_HELPONSTARTUP
DECLARE_ASCII("com.sun.star.comp.framework.HelpOnStartup" )
-#define IMPLEMENTATIONNAME_SHELLJOB
DECLARE_ASCII("com.sun.star.comp.framework.ShellJob" )
-#define IMPLEMENTATIONNAME_FWK_TASKCREATOR
DECLARE_ASCII("com.sun.star.comp.framework.TaskCreator" )
-#define IMPLEMENTATIONNAME_TABWINFACTORY
DECLARE_ASCII("com.sun.star.comp.framework.TabWindowFactory" )
-#define IMPLEMENTATIONNAME_TABWINDOW
DECLARE_ASCII("com.sun.star.comp.framework.TabWindow" )
-#define IMPLEMENTATIONNAME_SYSTEMEXEC
DECLARE_ASCII("com.sun.star.comp.framework.SystemExecute" )
-#define IMPLEMENTATIONNAME_URIABBREVIATION
DECLARE_ASCII("com.sun.star.comp.framework.UriAbbreviation" )
-#define IMPLEMENTATIONNAME_POPUPMENUDISPATCHER
DECLARE_ASCII("com.sun.star.comp.framework.PopupMenuControllerDispatcher" )
-#define IMPLEMENTATIONNAME_LANGUAGESELECTIONMENUCONTROLLER
DECLARE_ASCII("com.sun.star.comp.framework.LanguageSelectionMenuController" )
+#define IMPLEMENTATIONNAME_MEDIATYPEDETECTIONHELPER
"com.sun.star.comp.framework.MediaTypeDetectionHelper"
+#define IMPLEMENTATIONNAME_OXT_HANDLER
"com.sun.star.comp.framework.OXTFileHandler"
+#define IMPLEMENTATIONNAME_QUICKLAUNCHER
"com.sun.star.comp.desktop.QuickstartWrapper"
+#define IMPLEMENTATIONNAME_DISPATCHRECORDERSUPPLIER
"com.sun.star.comp.framework.DispatchRecorderSupplier"
+#define IMPLEMENTATIONNAME_MAILTODISPATCHER
"com.sun.star.comp.framework.MailToDispatcher"
+#define IMPLEMENTATIONNAME_SERVICEHANDLER
"com.sun.star.comp.framework.ServiceHandler"
+#define IMPLEMENTATIONNAME_DISPATCHHELPER
"com.sun.star.comp.framework.services.DispatchHelper"
+#define IMPLEMENTATIONNAME_MACROSMENUCONTROLLER
"com.sun.star.comp.framework.MacrosMenuController"
+#define IMPLEMENTATIONNAME_FONTMENUCONTROLLER
"com.sun.star.comp.framework.FontMenuController"
+#define IMPLEMENTATIONNAME_FONTSIZEMENUCONTROLLER
"com.sun.star.comp.framework.FontSizeMenuController"
+#define IMPLEMENTATIONNAME_HEADERMENUCONTROLLER
"com.sun.star.comp.framework.HeaderMenuController"
+#define IMPLEMENTATIONNAME_FOOTERMENUCONTROLLER
"com.sun.star.comp.framework.FooterMenuController"
+#define IMPLEMENTATIONNAME_NEWMENUCONTROLLER
"com.sun.star.comp.framework.NewMenuController"
+#define IMPLEMENTATIONNAME_TOOLBARSMENUCONTROLLER
"com.sun.star.comp.framework.ToolBarsMenuController"
+#define IMPLEMENTATIONNAME_HELPONSTARTUP
"com.sun.star.comp.framework.HelpOnStartup"
+#define IMPLEMENTATIONNAME_SHELLJOB
"com.sun.star.comp.framework.ShellJob"
+#define IMPLEMENTATIONNAME_FWK_TASKCREATOR
"com.sun.star.comp.framework.TaskCreator"
+#define IMPLEMENTATIONNAME_TABWINFACTORY
"com.sun.star.comp.framework.TabWindowFactory"
+#define IMPLEMENTATIONNAME_TABWINDOW
"com.sun.star.comp.framework.TabWindow"
+#define IMPLEMENTATIONNAME_SYSTEMEXEC
"com.sun.star.comp.framework.SystemExecute"
+#define IMPLEMENTATIONNAME_URIABBREVIATION
"com.sun.star.comp.framework.UriAbbreviation"
+#define IMPLEMENTATIONNAME_POPUPMENUDISPATCHER
"com.sun.star.comp.framework.PopupMenuControllerDispatcher"
+#define IMPLEMENTATIONNAME_LANGUAGESELECTIONMENUCONTROLLER
"com.sun.star.comp.framework.LanguageSelectionMenuController"
} // namespace framework
diff --git a/framework/inc/services/dispatchhelper.hxx
b/framework/inc/services/dispatchhelper.hxx
index 05f6dd1..ae290c3 100644
--- a/framework/inc/services/dispatchhelper.hxx
+++ b/framework/inc/services/dispatchhelper.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_DISPATCHHELPER_HXX
#define INCLUDED_FRAMEWORK_INC_SERVICES_DISPATCHHELPER_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx
b/framework/inc/services/mediatypedetectionhelper.hxx
index da705be..bff67bd 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_MEDIATYPEDETECTIONHELPER_HXX
#define INCLUDED_FRAMEWORK_INC_SERVICES_MEDIATYPEDETECTIONHELPER_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
diff --git a/framework/inc/tabwin/tabwindow.hxx
b/framework/inc/tabwin/tabwindow.hxx
index 8ad8a47..98ab0d7 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_FRAMEWORK_INC_TABWIN_TABWINDOW_HXX
#include <stdtypes.h>
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
diff --git a/framework/inc/tabwin/tabwinfactory.hxx
b/framework/inc/tabwin/tabwinfactory.hxx
index d041070..a10775a 100644
--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_FRAMEWORK_INC_TABWIN_TABWINFACTORY_HXX
#include <stdtypes.h>
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
diff --git a/framework/inc/targets.h b/framework/inc/targets.h
index 0405d91..09155f3 100644
--- a/framework/inc/targets.h
+++ b/framework/inc/targets.h
@@ -20,8 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_TARGETS_H
#define INCLUDED_FRAMEWORK_INC_TARGETS_H
-#include <macros/generic.hxx>
-
namespace framework{
// Values for special frame search ... sTargetFrameName of findFrame() or
queryDispatch() or loadComponentFromURL()
diff --git a/framework/inc/uiconfiguration/globalsettings.hxx
b/framework/inc/uiconfiguration/globalsettings.hxx
index 5ea7355..2609647 100644
--- a/framework/inc/uiconfiguration/globalsettings.hxx
+++ b/framework/inc/uiconfiguration/globalsettings.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX
#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx
b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index a16fe6f..e3009a8 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX
#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx
b/framework/inc/uielement/addonstoolbarmanager.hxx
index b10a2fd..28305d8 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_ADDONSTOOLBARMANAGER_HXX
#include <uielement/toolbarmanager.hxx>
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
diff --git a/framework/inc/uielement/commandinfo.hxx
b/framework/inc/uielement/commandinfo.hxx
index 9b8ddae..eab635c 100644
--- a/framework/inc/uielement/commandinfo.hxx
+++ b/framework/inc/uielement/commandinfo.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_COMMANDINFO_HXX
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_COMMANDINFO_HXX
-#include <macros/generic.hxx>
#include <stdtypes.h>
namespace framework
diff --git a/framework/inc/uielement/constitemcontainer.hxx
b/framework/inc/uielement/constitemcontainer.hxx
index 97c9555..387d770 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
diff --git a/framework/inc/uielement/itemcontainer.hxx
b/framework/inc/uielement/itemcontainer.hxx
index 924b323..5e60ce9 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_ITEMCONTAINER_HXX
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_ITEMCONTAINER_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <helper/shareablemutex.hxx>
diff --git a/framework/inc/uielement/progressbarwrapper.hxx
b/framework/inc/uielement/progressbarwrapper.hxx
index f4bbc17..73f9328 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_PROGRESSBARWRAPPER_HXX
#include <helper/uielementwrapperbase.hxx>
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
diff --git a/framework/inc/uielement/rootitemcontainer.hxx
b/framework/inc/uielement/rootitemcontainer.hxx
index 64d87e3..31f723e 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_ROOTITEMCONTAINER_HXX
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_ROOTITEMCONTAINER_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <helper/shareablemutex.hxx>
diff --git a/framework/inc/uielement/statusbarmanager.hxx
b/framework/inc/uielement/statusbarmanager.hxx
index 31c47cb..1bef72c 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMANAGER_HXX
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMANAGER_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <stdtypes.h>
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index 10370a8..f6a6510 100644
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
diff --git a/framework/inc/uielement/toolbarmanager.hxx
b/framework/inc/uielement/toolbarmanager.hxx
index 07085a8..fa62c63 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMANAGER_HXX
#define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMANAGER_HXX
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <stdtypes.h>
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx
b/framework/inc/uifactory/factoryconfiguration.hxx
index a9b2f12..37a24de 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX
#define INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX
-#include <macros/generic.hxx>
+
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx
b/framework/source/accelerators/acceleratorconfiguration.cxx
index 96ccfb1..e5f05e97 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -872,11 +872,11 @@ void SAL_CALL
XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
return;
long nOpenModes = css::embed::ElementModes::READWRITE;
- css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage =
xStorage->openStorageElement(OUString("accelerator"), nOpenModes);
+ css::uno::Reference< css::embed::XStorage > xAcceleratorTypeStorage =
xStorage->openStorageElement("accelerator", nOpenModes);
if (!xAcceleratorTypeStorage.is())
return;
- css::uno::Reference< css::io::XStream > xStream =
xAcceleratorTypeStorage->openStreamElement(OUString("current"), nOpenModes);
+ css::uno::Reference< css::io::XStream > xStream =
xAcceleratorTypeStorage->openStreamElement("current", nOpenModes);
css::uno::Reference< css::io::XOutputStream > xOut;
if (xStream.is())
xOut = xStream->getOutputStream();
diff --git a/framework/source/accelerators/keymapping.cxx
b/framework/source/accelerators/keymapping.cxx
index 6b096a8..ec02c32 100644
--- a/framework/source/accelerators/keymapping.cxx
+++ b/framework/source/accelerators/keymapping.cxx
@@ -19,8 +19,6 @@
#include <accelerators/keymapping.hxx>
-#include <macros/generic.hxx>
-
#include <com/sun/star/awt/Key.hpp>
namespace framework
diff --git a/framework/source/classes/fwktabwindow.cxx
b/framework/source/classes/fwktabwindow.cxx
index 3f1bade..b95258c 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -134,7 +134,7 @@ bool FwkTabPage::CallMethod( const OUString& rMethod )
{
try
{
- bRet = m_xEventHdl->callHandlerMethod( m_xPage, uno::makeAny(
rMethod ), OUString(EXTERNAL_EVENT) );
+ bRet = m_xEventHdl->callHandlerMethod( m_xPage, uno::makeAny(
rMethod ), EXTERNAL_EVENT );
}
catch ( const uno::Exception& )
{
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx
b/framework/source/dispatch/popupmenudispatcher.cxx
index 0db118c..fbc3b7b 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -315,7 +315,7 @@ void
PopupMenuDispatcher::impl_RetrievePopupControllerQuery()
{
try
{
- xPropSet->getPropertyValue( FRAME_PROPNAME_LAYOUTMANAGER )
>>= xLayoutManager;
+ xPropSet->getPropertyValue(
FRAME_PROPNAME_ASCII_LAYOUTMANAGER ) >>= xLayoutManager;
if ( xLayoutManager.is() )
{
diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx
b/framework/source/fwe/classes/framelistanalyzer.cxx
index bc892a2..e7c88e9 100644
--- a/framework/source/fwe/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -112,7 +112,7 @@ void FrameListAnalyzer::impl_analyze()
(xSet.is() )
)
{
- xSet->getPropertyValue(FRAME_PROPNAME_ISHIDDEN) >>=
m_bReferenceIsHidden;
+ xSet->getPropertyValue(FRAME_PROPNAME_ASCII_ISHIDDEN) >>=
m_bReferenceIsHidden;
}
// check, if the reference frame includes the backing component.
@@ -232,7 +232,7 @@ void FrameListAnalyzer::impl_analyze()
xSet.set(xFrame, css::uno::UNO_QUERY);
if (xSet.is())
{
- xSet->getPropertyValue(FRAME_PROPNAME_ISHIDDEN) >>=
bHidden;
+ xSet->getPropertyValue(FRAME_PROPNAME_ASCII_ISHIDDEN) >>=
bHidden;
}
}
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx
b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 2098c13..2bb7593 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -50,7 +50,7 @@ bool IsSeparator( Reference< XPropertySet > xPropertySet )
Reference< XServiceInfo > xServiceInfo( xPropertySet, UNO_QUERY );
try
{
- return xServiceInfo->supportsService( OUString(
SERVICENAME_ACTIONTRIGGERSEPARATOR ) );
+ return xServiceInfo->supportsService(
SERVICENAME_ACTIONTRIGGERSEPARATOR );
}
catch (const Exception&)
{
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx
b/framework/source/fwe/xml/menudocumenthandler.cxx
index 8d47ee4..24ca38b 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -753,7 +753,7 @@ throw ( SAXException, RuntimeException )
Reference< XExtendedDocumentHandler > xExtendedDocHandler(
m_xWriteDocumentHandler, UNO_QUERY );
if ( xExtendedDocHandler.is() )
{
- xExtendedDocHandler->unknown( OUString( MENUBAR_DOCTYPE ) );
+ xExtendedDocHandler->unknown( MENUBAR_DOCTYPE );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
}
@@ -765,13 +765,13 @@ throw ( SAXException, RuntimeException )
m_aAttributeType,
OUString( "menubar" ) );
- m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_MENUBAR ),
pList );
+ m_xWriteDocumentHandler->startElement( ELEMENT_NS_MENUBAR, pList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
WriteMenu( m_xMenuBarContainer );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_MENUBAR ) );
+ m_xWriteDocumentHandler->endElement( ELEMENT_NS_MENUBAR );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
m_xWriteDocumentHandler->endDocument();
}
@@ -820,17 +820,17 @@ throw ( SAXException, RuntimeException )
aLabel );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->startElement( OUString(
ELEMENT_NS_MENU ), xListMenu );
+ m_xWriteDocumentHandler->startElement( ELEMENT_NS_MENU,
xListMenu );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->startElement( OUString(
ELEMENT_NS_MENUPOPUP ), m_xEmptyList );
+ m_xWriteDocumentHandler->startElement(
ELEMENT_NS_MENUPOPUP, m_xEmptyList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
WriteMenu( xSubMenu );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString(
ELEMENT_NS_MENUPOPUP ) );
+ m_xWriteDocumentHandler->endElement( ELEMENT_NS_MENUPOPUP
);
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString(
ELEMENT_NS_MENU ) );
+ m_xWriteDocumentHandler->endElement( ELEMENT_NS_MENU );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
bSeparator = false;
}
@@ -898,17 +898,17 @@ void OWriteMenuDocumentHandler::WriteMenuItem( const
OUString& aCommandURL, cons
}
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_MENUITEM ),
xList );
+ m_xWriteDocumentHandler->startElement( ELEMENT_NS_MENUITEM, xList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_MENUITEM ) );
+ m_xWriteDocumentHandler->endElement( ELEMENT_NS_MENUITEM );
}
void OWriteMenuDocumentHandler::WriteMenuSeparator()
{
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_MENUSEPARATOR
), m_xEmptyList );
+ m_xWriteDocumentHandler->startElement( ELEMENT_NS_MENUSEPARATOR,
m_xEmptyList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_MENUSEPARATOR )
);
+ m_xWriteDocumentHandler->endElement( ELEMENT_NS_MENUSEPARATOR );
}
} // namespace framework
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx
b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index 01f974f..1bd69f0 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -509,7 +509,7 @@ void
OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw
Reference< XExtendedDocumentHandler > xExtendedDocHandler(
m_xWriteDocumentHandler, UNO_QUERY );
if ( xExtendedDocHandler.is() )
{
- xExtendedDocHandler->unknown( OUString( STATUSBAR_DOCTYPE ) );
+ xExtendedDocHandler->unknown( STATUSBAR_DOCTYPE );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
}
@@ -524,7 +524,7 @@ void
OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw
m_aAttributeType,
OUString( XMLNS_XLINK ) );
- m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_STATUSBAR ),
pList );
+ m_xWriteDocumentHandler->startElement( ELEMENT_NS_STATUSBAR, pList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
sal_Int32 nItemCount = m_aStatusBarItems->getCount();
@@ -556,7 +556,7 @@ void
OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw
}
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_STATUSBAR ) );
+ m_xWriteDocumentHandler->endElement( ELEMENT_NS_STATUSBAR );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
m_xWriteDocumentHandler->endDocument();
}
@@ -649,9 +649,9 @@ throw ( SAXException, RuntimeException )
}
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_STATUSBARITEM
), xList );
+ m_xWriteDocumentHandler->startElement( ELEMENT_NS_STATUSBARITEM, xList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_STATUSBARITEM )
);
+ m_xWriteDocumentHandler->endElement( ELEMENT_NS_STATUSBARITEM );
}
} // namespace framework
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index db0bf82..2a0333e 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -679,7 +679,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument()
throw
Reference< XExtendedDocumentHandler > xExtendedDocHandler(
m_xWriteDocumentHandler, UNO_QUERY );
if ( xExtendedDocHandler.is() )
{
- xExtendedDocHandler->unknown( OUString( TOOLBAR_DOCTYPE ) );
+ xExtendedDocHandler->unknown( TOOLBAR_DOCTYPE );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
}
@@ -712,7 +712,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument()
throw
m_aAttributeType,
aUIName );
- m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_TOOLBAR ),
pList );
+ m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBAR, pList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
sal_Int32 nItemCount = m_rItemAccess->getCount();
@@ -746,7 +746,7 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument()
throw
}
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_TOOLBAR ) );
+ m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBAR );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
m_xWriteDocumentHandler->endDocument();
}
@@ -829,36 +829,36 @@ throw ( SAXException, RuntimeException )
}
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_TOOLBARITEM ),
xList );
+ m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARITEM, xList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_TOOLBARITEM ) );
+ m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARITEM );
}
void OWriteToolBoxDocumentHandler::WriteToolBoxSpace() throw
( SAXException, RuntimeException )
{
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_TOOLBARSPACE
), m_xEmptyList );
+ m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARSPACE,
m_xEmptyList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_TOOLBARSPACE ) );
+ m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARSPACE );
}
void OWriteToolBoxDocumentHandler::WriteToolBoxBreak() throw
( SAXException, RuntimeException )
{
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_TOOLBARBREAK
), m_xEmptyList );
+ m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARBREAK,
m_xEmptyList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_TOOLBARBREAK ) );
+ m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARBREAK );
}
void OWriteToolBoxDocumentHandler::WriteToolBoxSeparator() throw
( SAXException, RuntimeException )
{
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->startElement( OUString(
ELEMENT_NS_TOOLBARSEPARATOR ), m_xEmptyList );
+ m_xWriteDocumentHandler->startElement( ELEMENT_NS_TOOLBARSEPARATOR,
m_xEmptyList );
m_xWriteDocumentHandler->ignorableWhitespace( OUString() );
- m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_TOOLBARSEPARATOR
) );
+ m_xWriteDocumentHandler->endElement( ELEMENT_NS_TOOLBARSEPARATOR );
}
} // namespace framework
diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx
b/framework/source/fwi/threadhelp/transactionmanager.cxx
index 2e7a537..a6ade42 100644
--- a/framework/source/fwi/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -23,8 +23,6 @@
#include <threadhelp/transactionmanager.hxx>
-#include <macros/generic.hxx>
-
#include <com/sun/star/lang/DisposedException.hpp>
namespace framework{
diff --git a/framework/source/helper/persistentwindowstate.cxx
b/framework/source/helper/persistentwindowstate.cxx
index afef67b..4eb6f8c 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -19,7 +19,6 @@
#include <pattern/window.hxx>
#include <helper/persistentwindowstate.hxx>
-#include <macros/generic.hxx>
#include <services.h>
#include <com/sun/star/awt/XWindow.hpp>
diff --git a/framework/source/helper/statusindicatorfactory.cxx
b/framework/source/helper/statusindicatorfactory.cxx
index dd76976..6743289 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -331,7 +331,7 @@ void
StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
if (xPropSet.is())
{
css::uno::Reference< css::frame::XLayoutManager2 > xLayoutManager;
- xPropSet->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>=
xLayoutManager;
+ xPropSet->getPropertyValue(FRAME_PROPNAME_ASCII_LAYOUTMANAGER) >>=
xLayoutManager;
if (xLayoutManager.is())
{
if ( !xLayoutManager->isVisible() )
@@ -408,7 +408,7 @@ void StatusIndicatorFactory::impl_createProgress()
if (xPropSet.is())
{
css::uno::Reference< css::frame::XLayoutManager2 > xLayoutManager;
- xPropSet->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>=
xLayoutManager;
+ xPropSet->getPropertyValue(FRAME_PROPNAME_ASCII_LAYOUTMANAGER) >>=
xLayoutManager;
if (xLayoutManager.is())
{
xLayoutManager->lock();
@@ -448,7 +448,7 @@ void StatusIndicatorFactory::impl_showProgress()
if (xPropSet.is())
{
css::uno::Reference< css::frame::XLayoutManager2 > xLayoutManager;
- xPropSet->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>=
xLayoutManager;
+ xPropSet->getPropertyValue(FRAME_PROPNAME_ASCII_LAYOUTMANAGER) >>=
xLayoutManager;
if (xLayoutManager.is())
{
// Be sure that we have always a progress. It can be that our
frame
@@ -487,9 +487,9 @@ void StatusIndicatorFactory::impl_hideProgress()
if (xPropSet.is())
{
css::uno::Reference< css::frame::XLayoutManager2 > xLayoutManager;
- xPropSet->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>=
xLayoutManager;
+ xPropSet->getPropertyValue(FRAME_PROPNAME_ASCII_LAYOUTMANAGER) >>=
xLayoutManager;
if (xLayoutManager.is())
- xLayoutManager->hideElement( OUString(PROGRESS_RESOURCE) );
+ xLayoutManager->hideElement( PROGRESS_RESOURCE );
}
}
}
diff --git a/framework/source/helper/tagwindowasmodified.cxx
b/framework/source/helper/tagwindowasmodified.cxx
index 15104f5..5f47e85 100644
--- a/framework/source/helper/tagwindowasmodified.cxx
+++ b/framework/source/helper/tagwindowasmodified.cxx
@@ -19,7 +19,6 @@
#include <helper/tagwindowasmodified.hxx>
#include <pattern/window.hxx>
-#include <macros/generic.hxx>
#include <services.h>
#include <com/sun/star/awt/XWindow.hpp>
diff --git a/framework/source/helper/titlebarupdate.cxx
b/framework/source/helper/titlebarupdate.cxx
index b79b5b2..6362b5a 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -20,7 +20,6 @@
#include <helper/titlebarupdate.hxx>
#include <pattern/window.hxx>
-#include <macros/generic.hxx>
#include <services.h>
#include <properties.h>
diff --git a/framework/source/interaction/quietinteraction.cxx
b/framework/source/interaction/quietinteraction.cxx
index c31d578..eed293f 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
@@ -19,8 +19,6 @@
#include "interaction/quietinteraction.hxx"
-#include <macros/generic.hxx>
-
#include <com/sun/star/task/XInteractionAbort.hpp>
#include <com/sun/star/task/XInteractionApprove.hpp>
#include <com/sun/star/document/XInteractionFilterSelect.hpp>
diff --git a/framework/source/layoutmanager/helpers.cxx
b/framework/source/layoutmanager/helpers.cxx
index 7a21bfb..738aaef 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -323,7 +323,7 @@ void impl_setDockingWindowVisibility( const
css::uno::Reference< css::uno::XComp
xDispatcher->executeDispatch(
xProvider,
aDockWinCommand,
- OUString("_self"),
+ "_self",
0,
aArgs);
}
diff --git a/framework/source/layoutmanager/helpers.hxx
b/framework/source/layoutmanager/helpers.hxx
index 921a50a..2b0a259 100644
--- a/framework/source/layoutmanager/helpers.hxx
+++ b/framework/source/layoutmanager/helpers.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_SOURCE_LAYOUTMANAGER_HELPERS_HXX
#define INCLUDED_FRAMEWORK_SOURCE_LAYOUTMANAGER_HELPERS_HXX
-#include <macros/generic.hxx>
#include <stdtypes.h>
#include <properties.h>
diff --git a/framework/source/layoutmanager/layoutmanager.cxx
b/framework/source/layoutmanager/layoutmanager.cxx
index 260ee34..150c12a 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2608,8 +2608,8 @@ IMPL_LINK_NOARG_TYPED(LayoutManager, MenuBarClose, void*,
void)
xDispatcher->executeDispatch(
xProvider,
- OUString(".uno:CloseWin"),
- OUString("_self"),
+ ".uno:CloseWin",
+ "_self",
0,
uno::Sequence< beans::PropertyValue >());
}
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 4567f66..ebab9ad 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -25,7 +25,6 @@
*/
#include <vector>
-#include <macros/generic.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index d7da617..7e819b8 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1809,11 +1809,11 @@ void AutoRecovery::implts_readAutoSaveConfig()
// AutoSave [bool]
bool bEnabled = false;
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
