diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-02 14:50:07 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-02 14:50:33 +0200 |
| commit | 7408498de37be05159f84cf0c8116313d3c196df (patch) | |
| tree | e9d7a25d5633b479325e734fd988e8e43377854d | |
| parent | 368b657f4ba4200e3f38fec58450c396ca73b729 (diff) | |
loplugin:stringconstant
Change-Id: I865efc1884b82d430fe7df2e432d43f5425a83d4
78 files changed, 144 insertions, 257 deletions
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h index 8d7bce53f6a5..f4ac1b174ff2 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 1071bd2e5d45..9537677acccd 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 e51602d1f455..57ca35896057 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 b7d80423739e..bf77143ddee7 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 ebfd832718b0..169e289255a0 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 8137a1d1dc19..d5a20d2a5c93 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 a03dd3572f21..3db9b6db1484 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 4ffea6b80190..f3fb8ed3d02b 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 a78c9996f381..e3b5b78b801f 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 3917bf8d235c..874ea6a9edf1 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 0b81cbb895b7..bd75de8d7f96 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 93cbae7eb007..31ecb62e8c6d 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 f8115ec60818..b14d4ffda6d6 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 d19af3bccffe..c1d6e679e8bb 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 bb7d81b63a2c..4ca92bfe6c37 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 683f9b170faf..0fd863af6238 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 605629894051..f4992706c5d6 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 6b2acd79443c..e3825372eb76 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 8664dde813b5..63f2d91150d4 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 b5ee0bf771b5..7885fa986906 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 adcab36df429..2067f169a6bc 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 100a7b225213..ff694c9c4e41 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 92473f891a90..f8d9b4fa1c52 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 a9fc01251fec..d4907a385365 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 d8ab361e9866..000000000000 --- 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 5acc4b0c0925..7faa55a21f9d 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 0c3389b4f410..738a06100189 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 273dcf577bb6..d49b459990d5 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 e7f8573da8d5..522a9668652d 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 05f6dd19870b..ae290c32ef4a 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 da705be1efba..bff67bd35217 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 8ad8a4731391..98ab0d73717c 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 d0410707cc05..a10775a2c2c7 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 0405d9168009..09155f397ef8 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 5ea735599771..2609647989db 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 a16fe6f9ec1b..e3009a872a99 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 b10a2fd8b5a4..28305d801940 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 9b8ddae17d53..eab635cc3f6c 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 97c9555036d9..387d770b9f05 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 924b3237558f..5e60ce9f1735 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 f4bbc173290e..73f93283050c 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 64d87e3642b2..31f723e00007 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 31c47cbe1a8c..1bef72cb811c 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 10370a83d50d..f6a65104912b 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 07085a8f1632..fa62c634f618 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 a9b2f12a5d9b..37a24de5b33e 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 96ccfb1e3c11..e5f05e979a72 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 6b096a899c7c..ec02c32e1a1b 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 3f1bade759d0..b95258ce9b78 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 0db118cf1073..fbc3b7b59d07 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 bc892a2606ac..e7c88e926a88 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 2098c13ff09c..2bb7593cc970 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 8d47ee48dace..24ca38b4b25f 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 01f974fafa93..1bd69f014093 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 db0bf828fd56..2a0333e00d56 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 2e7a537b2c58..a6ade421260f 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 afef67bfbbe1..4eb6f8cf2894 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 dd76976b691b..67432898f664 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 15104f5fb8b6..5f47e85e5854 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 b79b5b2bd921..6362b5a51258 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 c31d5788cac3..eed293f776d5 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 7a21bfbc6d82..738aaef3201e 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 921a50a98c0b..2b0a259adbae 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 260ee34325fb..150c12a413ce 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 4567f6647796..ebab9ad59135 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 d7da617df0a5..7e819b82eaa8 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; - xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_AUTOSAVE_ENABLED)) >>= bEnabled; + xCommonRegistry->getByHierarchicalName(CFG_ENTRY_AUTOSAVE_ENABLED) >>= bEnabled; // UserAutoSave [bool] bool bUserEnabled = false; - xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_USERAUTOSAVE_ENABLED)) >>= bUserEnabled; + xCommonRegistry->getByHierarchicalName(CFG_ENTRY_USERAUTOSAVE_ENABLED) >>= bUserEnabled; /* SAFE */ { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -1840,7 +1840,7 @@ void AutoRecovery::implts_readAutoSaveConfig() // AutoSaveTimeIntervall [int] in min sal_Int32 nTimeIntervall = 10; - xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_AUTOSAVE_TIMEINTERVALL)) >>= nTimeIntervall; + xCommonRegistry->getByHierarchicalName(CFG_ENTRY_AUTOSAVE_TIMEINTERVALL) >>= nTimeIntervall; /* SAFE */ { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); @@ -1870,7 +1870,7 @@ void AutoRecovery::implts_readConfig() css::uno::Any aValue; // RecoveryList [set] - aValue = xCommonRegistry->getByHierarchicalName(OUString(CFG_ENTRY_RECOVERYLIST)); + aValue = xCommonRegistry->getByHierarchicalName(CFG_ENTRY_RECOVERYLIST); css::uno::Reference< css::container::XNameAccess > xList; aValue >>= xList; if (xList.is()) @@ -1894,14 +1894,14 @@ void AutoRecovery::implts_readConfig() AutoRecovery::TDocumentInfo aInfo; aInfo.NewTempURL.clear(); aInfo.Document.clear(); - xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_ORIGINALURL)) >>= aInfo.OrgURL; - xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TEMPURL)) >>= aInfo.OldTempURL; - xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TEMPLATEURL)) >>= aInfo.TemplateURL; - xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_FILTER)) >>= aInfo.RealFilter; - xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_DOCUMENTSTATE)) >>= aInfo.DocumentState; - xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_MODULE)) >>= aInfo.AppModule; - xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_TITLE)) >>= aInfo.Title; - xItem->getPropertyValue(OUString(CFG_ENTRY_PROP_VIEWNAMES)) >>= aInfo.ViewNames; + xItem->getPropertyValue(CFG_ENTRY_PROP_ORIGINALURL) >>= aInfo.OrgURL; + xItem->getPropertyValue(CFG_ENTRY_PROP_TEMPURL) >>= aInfo.OldTempURL; + xItem->getPropertyValue(CFG_ENTRY_PROP_TEMPLATEURL) >>= aInfo.TemplateURL; + xItem->getPropertyValue(CFG_ENTRY_PROP_FILTER) >>= aInfo.RealFilter; + xItem->getPropertyValue(CFG_ENTRY_PROP_DOCUMENTSTATE) >>= aInfo.DocumentState; + xItem->getPropertyValue(CFG_ENTRY_PROP_MODULE) >>= aInfo.AppModule; + xItem->getPropertyValue(CFG_ENTRY_PROP_TITLE) >>= aInfo.Title; + xItem->getPropertyValue(CFG_ENTRY_PROP_VIEWNAMES) >>= aInfo.ViewNames; implts_specifyAppModuleAndFactory(aInfo); implts_specifyDefaultFilterAndExtension(aInfo); @@ -1968,7 +1968,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume xCFG->getByName(rInfo.AppModule), css::uno::UNO_QUERY_THROW); - xModuleProps->getByName(OUString(CFG_ENTRY_REALDEFAULTFILTER)) >>= rInfo.DefaultFilter; + xModuleProps->getByName(CFG_ENTRY_REALDEFAULTFILTER) >>= rInfo.DefaultFilter; css::uno::Reference< css::container::XNameAccess > xFilterCFG( m_xContext->getServiceManager()->createInstanceWithContext( @@ -2076,7 +2076,7 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn xCFG.set(implts_openConfig(), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNameAccess > xCheck; - xCFG->getByHierarchicalName(OUString(CFG_ENTRY_RECOVERYLIST)) >>= xCheck; + xCFG->getByHierarchicalName(CFG_ENTRY_RECOVERYLIST) >>= xCheck; css::uno::Reference< css::container::XNameContainer > xModify(xCheck, css::uno::UNO_QUERY_THROW); css::uno::Reference< css::lang::XSingleServiceFactory > xCreate(xCheck, css::uno::UNO_QUERY_THROW); @@ -2111,14 +2111,14 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn else xCheck->getByName(sID) >>= xSet; - xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_ORIGINALURL), css::uno::makeAny(rInfo.OrgURL )); - xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_TEMPURL), css::uno::makeAny(rInfo.OldTempURL )); - xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_TEMPLATEURL), css::uno::makeAny(rInfo.TemplateURL )); - xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_FILTER), css::uno::makeAny(rInfo.RealFilter)); - xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_DOCUMENTSTATE), css::uno::makeAny(rInfo.DocumentState)); - xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_MODULE), css::uno::makeAny(rInfo.AppModule)); - xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_TITLE), css::uno::makeAny(rInfo.Title)); - xSet->setPropertyValue(OUString(CFG_ENTRY_PROP_VIEWNAMES), css::uno::makeAny(rInfo.ViewNames)); + xSet->setPropertyValue(CFG_ENTRY_PROP_ORIGINALURL, css::uno::makeAny(rInfo.OrgURL )); + xSet->setPropertyValue(CFG_ENTRY_PROP_TEMPURL, css::uno::makeAny(rInfo.OldTempURL )); + xSet->setPropertyValue(CFG_ENTRY_PROP_TEMPLATEURL, css::uno::makeAny(rInfo.TemplateURL )); + xSet->setPropertyValue(CFG_ENTRY_PROP_FILTER, css::uno::makeAny(rInfo.RealFilter)); + xSet->setPropertyValue(CFG_ENTRY_PROP_DOCUMENTSTATE, css::uno::makeAny(rInfo.DocumentState)); + xSet->setPropertyValue(CFG_ENTRY_PROP_MODULE, css::uno::makeAny(rInfo.AppModule)); + xSet->setPropertyValue(CFG_ENTRY_PROP_TITLE, css::uno::makeAny(rInfo.Title)); + xSet->setPropertyValue(CFG_ENTRY_PROP_VIEWNAMES, css::uno::makeAny(rInfo.ViewNames)); if (bNew) xModify->insertByName(sID, css::uno::makeAny(xSet)); @@ -4265,7 +4265,7 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo& { css::uno::Reference< css::beans::XPropertySet > xFrameProps(xFrame, css::uno::UNO_QUERY); if (xFrameProps.is()) - xFrameProps->setPropertyValue(FRAME_PROPNAME_INDICATORINTERCEPTION, css::uno::makeAny(xExternalProgress)); + xFrameProps->setPropertyValue(FRAME_PROPNAME_ASCII_INDICATORINTERCEPTION, css::uno::makeAny(xExternalProgress)); } // But inside the MediaDescriptor we must set our own create progress ... @@ -4296,7 +4296,7 @@ void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo& // stop progress interception on corresponding frame. css::uno::Reference< css::beans::XPropertySet > xFrameProps(xFrame, css::uno::UNO_QUERY); if (xFrameProps.is()) - xFrameProps->setPropertyValue(FRAME_PROPNAME_INDICATORINTERCEPTION, css::uno::makeAny(css::uno::Reference< css::task::XStatusIndicator >())); + xFrameProps->setPropertyValue(FRAME_PROPNAME_ASCII_INDICATORINTERCEPTION, css::uno::makeAny(css::uno::Reference< css::task::XStatusIndicator >())); // forget progress inside list of arguments. utl::MediaDescriptor::iterator pArg = rArgs.find(utl::MediaDescriptor::PROP_STATUSINDICATOR()); diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index de006a7f8522..bf1ce7812389 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -1577,11 +1577,11 @@ const css::uno::Sequence< css::beans::Property > Desktop::impl_getStaticProperty const css::beans::Property pProperties[] = { - css::beans::Property( DESKTOP_PROPNAME_ACTIVEFRAME , DESKTOP_PROPHANDLE_ACTIVEFRAME , cppu::UnoType<css::lang::XComponent>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( DESKTOP_PROPNAME_DISPATCHRECORDERSUPPLIER , DESKTOP_PROPHANDLE_DISPATCHRECORDERSUPPLIER, cppu::UnoType<css::frame::XDispatchRecorderSupplier>::get(), css::beans::PropertyAttribute::TRANSIENT ), - css::beans::Property( DESKTOP_PROPNAME_ISPLUGGED , DESKTOP_PROPHANDLE_ISPLUGGED , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), - css::beans::Property( DESKTOP_PROPNAME_SUSPENDQUICKSTARTVETO , DESKTOP_PROPHANDLE_SUSPENDQUICKSTARTVETO , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::TRANSIENT ), - css::beans::Property( DESKTOP_PROPNAME_TITLE , DESKTOP_PROPHANDLE_TITLE , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT ), + css::beans::Property( DESKTOP_PROPNAME_ASCII_ACTIVEFRAME , DESKTOP_PROPHANDLE_ACTIVEFRAME , cppu::UnoType<css::lang::XComponent>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), + css::beans::Property( DESKTOP_PROPNAME_ASCII_DISPATCHRECORDERSUPPLIER , DESKTOP_PROPHANDLE_DISPATCHRECORDERSUPPLIER, cppu::UnoType<css::frame::XDispatchRecorderSupplier>::get(), css::beans::PropertyAttribute::TRANSIENT ), + css::beans::Property( DESKTOP_PROPNAME_ASCII_ISPLUGGED , DESKTOP_PROPHANDLE_ISPLUGGED , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY ), + css::beans::Property( DESKTOP_PROPNAME_ASCII_SUSPENDQUICKSTARTVETO , DESKTOP_PROPHANDLE_SUSPENDQUICKSTARTVETO , cppu::UnoType<bool>::get() , css::beans::PropertyAttribute::TRANSIENT ), + css::beans::Property( DESKTOP_PROPNAME_ASCII_TITLE , DESKTOP_PROPHANDLE_TITLE , cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT ), }; // Use it to initialize sequence! const css::uno::Sequence< css::beans::Property > lPropertyDescriptor( pProperties, DESKTOP_PROPCOUNT ); diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index c10e13575c87..53d4fdeffc73 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -2647,35 +2647,35 @@ void Frame::impl_initializePropInfo() impl_addPropertyInfo( css::beans::Property( - FRAME_PROPNAME_DISPATCHRECORDERSUPPLIER, + FRAME_PROPNAME_ASCII_DISPATCHRECORDERSUPPLIER, FRAME_PROPHANDLE_DISPATCHRECORDERSUPPLIER, cppu::UnoType<css::frame::XDispatchRecorderSupplier>::get(), css::beans::PropertyAttribute::TRANSIENT)); impl_addPropertyInfo( css::beans::Property( - FRAME_PROPNAME_INDICATORINTERCEPTION, + FRAME_PROPNAME_ASCII_INDICATORINTERCEPTION, FRAME_PROPHANDLE_INDICATORINTERCEPTION, cppu::UnoType<css::task::XStatusIndicator>::get(), css::beans::PropertyAttribute::TRANSIENT)); impl_addPropertyInfo( css::beans::Property( - FRAME_PROPNAME_ISHIDDEN, + FRAME_PROPNAME_ASCII_ISHIDDEN, FRAME_PROPHANDLE_ISHIDDEN, cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::READONLY)); impl_addPropertyInfo( css::beans::Property( - FRAME_PROPNAME_LAYOUTMANAGER, + FRAME_PROPNAME_ASCII_LAYOUTMANAGER, FRAME_PROPHANDLE_LAYOUTMANAGER, cppu::UnoType<css::frame::XLayoutManager>::get(), css::beans::PropertyAttribute::TRANSIENT)); impl_addPropertyInfo( css::beans::Property( - FRAME_PROPNAME_TITLE, + FRAME_PROPNAME_ASCII_TITLE, FRAME_PROPHANDLE_TITLE, cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT)); @@ -3124,7 +3124,7 @@ void Frame::impl_setCloser( /*IN*/ const css::uno::Reference< css::frame::XFrame { css::uno::Reference< css::beans::XPropertySet > xFrameProps(xFrame, css::uno::UNO_QUERY_THROW); css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - xFrameProps->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>= xLayoutManager; + xFrameProps->getPropertyValue(FRAME_PROPNAME_ASCII_LAYOUTMANAGER) >>= xLayoutManager; css::uno::Reference< css::beans::XPropertySet > xLayoutProps(xLayoutManager, css::uno::UNO_QUERY_THROW); xLayoutProps->setPropertyValue(LAYOUTMANAGER_PROPNAME_MENUBARCLOSER, css::uno::makeAny(bState)); } diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx index b349cacdbe23..62f7b1c805f4 100644 --- a/framework/source/services/tabwindowservice.cxx +++ b/framework/source/services/tabwindowservice.cxx @@ -36,7 +36,6 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <classes/propertysethelper.hxx> -#include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 0287af110eb6..d2117ae625bb 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -392,11 +392,11 @@ void ImageManagerImpl::implts_initialize() try { - m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( OUString(IMAGE_FOLDER ), + m_xUserImageStorage = m_xUserConfigStorage->openStorageElement( IMAGE_FOLDER, nModes ); if ( m_xUserImageStorage.is() ) { - m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( OUString(BITMAPS_FOLDER ), + m_xUserBitmapsStorage = m_xUserImageStorage->openStorageElement( BITMAPS_FOLDER, nModes ); } } @@ -1291,11 +1291,11 @@ void ImageManagerImpl::storeToStorage( const uno::Reference< XStorage >& Storage { long nModes = ElementModes::READWRITE; - uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( OUString(IMAGE_FOLDER ), + uno::Reference< XStorage > xUserImageStorage = Storage->openStorageElement( IMAGE_FOLDER, nModes ); if ( xUserImageStorage.is() ) { - uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( OUString(BITMAPS_FOLDER ), + uno::Reference< XStorage > xUserBitmapsStorage = xUserImageStorage->openStorageElement( BITMAPS_FOLDER, nModes ); for ( sal_Int32 i = 0; i < ImageType_COUNT; i++ ) { diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 91cec796e0f5..0ac09cc41fc6 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX #define INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX -#include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx index 982ab0a283fc..bbdb74e78357 100644 --- a/framework/source/uielement/genericstatusbarcontroller.cxx +++ b/framework/source/uielement/genericstatusbarcontroller.cxx @@ -139,7 +139,7 @@ throw ( RuntimeException, std::exception ) if ( xGraphicProps.is() && m_xGraphic->getType() != graphic::GraphicType::EMPTY ) { awt::Size aGraphicSize; - xGraphicProps->getPropertyValue( OUString( "SizePixel" ) ) >>= aGraphicSize; + xGraphicProps->getPropertyValue( "SizePixel" ) >>= aGraphicSize; OSL_ENSURE( aGraphicSize.Height > 0 && aGraphicSize.Width > 0, "Empty status bar graphic!" ); sal_Int32 nOffset = m_xStatusbarItem->getOffset( ); diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index 58b53b2bb983..723aee1e3c8c 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -55,7 +55,6 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ref.hxx> -#include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 317d5396f1e0..3019ebe2a03c 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -24,7 +24,6 @@ #include <framework/addonsoptions.hxx> #include <uielement/statusbarmerger.hxx> #include <uielement/statusbaritem.hxx> -#include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <stdtypes.h> diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index deba211b0d6e..d30ee80a5f72 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -362,9 +362,9 @@ void ToolBarManager::UpdateImageOrientation() Sequence< OUString > aSeqMirrorCmd; Sequence< OUString > aSeqRotateCmd; m_xUICommandLabels->getByName( - OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST )) >>= aSeqMirrorCmd; + UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST ) >>= aSeqMirrorCmd; m_xUICommandLabels->getByName( - OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST )) >>= aSeqRotateCmd; + UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST ) >>= aSeqRotateCmd; CommandToInfoMap::iterator pIter; for ( i = 0; i < aSeqMirrorCmd.getLength(); i++ ) diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 9603cb12c6a6..de99a7be0962 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -386,7 +386,7 @@ bool ConfigurationAccess_UICommand::addGenericInfoToCache() try { if ( m_xGenericUICommands->getByName( - OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST )) >>= aCommandNameSeq ) + UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST ) >>= aCommandNameSeq ) m_aCommandRotateImageList = comphelper::concatSequences< OUString >( m_aCommandRotateImageList, aCommandNameSeq ); } catch (const RuntimeException&) @@ -400,7 +400,7 @@ bool ConfigurationAccess_UICommand::addGenericInfoToCache() try { if ( m_xGenericUICommands->getByName( - OUString( UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST )) >>= aCommandNameSeq ) + UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDMIRRORIMAGELIST ) >>= aCommandNameSeq ) m_aCommandMirrorImageList = comphelper::concatSequences< OUString >( m_aCommandMirrorImageList, aCommandNameSeq ); } catch (const RuntimeException&) diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx index 07485df4455f..4b6b3f728014 100644 --- a/framework/source/uifactory/addonstoolbarfactory.cxx +++ b/framework/source/uifactory/addonstoolbarfactory.cxx @@ -35,7 +35,6 @@ #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> -#include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 232073a7d3ab..20c5bb42ab7e 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -624,7 +624,7 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw Reference< XExtendedDocumentHandler > xExtendedDocHandler( m_xWriteDocumentHandler, UNO_QUERY ); if ( xExtendedDocHandler.is() ) { - xExtendedDocHandler->unknown( OUString( IMAGES_DOCTYPE ) ); + xExtendedDocHandler->unknown( IMAGES_DOCTYPE ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); } @@ -639,7 +639,7 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw m_aAttributeType, OUString( XMLNS_XLINK ) ); - m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_IMAGESCONTAINER ), pList ); + m_xWriteDocumentHandler->startElement( ELEMENT_NS_IMAGESCONTAINER, pList ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); if ( m_aImageListsItems.pImageList ) @@ -659,7 +659,7 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw } m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_IMAGESCONTAINER ) ); + m_xWriteDocumentHandler->endElement( ELEMENT_NS_IMAGESCONTAINER ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); m_xWriteDocumentHandler->endDocument(); } @@ -722,7 +722,7 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* pImageList->aHighContrastURL ); } - m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_IMAGES ), xList ); + m_xWriteDocumentHandler->startElement( ELEMENT_NS_IMAGES, xList ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); ImageItemListDescriptor* pImageItemList = pImageList->pImageItemList; @@ -732,7 +732,7 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* WriteImage( &(*pImageItemList)[i] ); } - m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_IMAGES ) ); + m_xWriteDocumentHandler->endElement( ELEMENT_NS_IMAGES ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); } @@ -750,17 +750,17 @@ void OWriteImagesDocumentHandler::WriteImage( const ImageItemDescriptor* pImage m_aAttributeType, pImage->aCommandURL ); - m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_ENTRY ), xList ); + m_xWriteDocumentHandler->startElement( ELEMENT_NS_ENTRY, xList ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_ENTRY ) ); + m_xWriteDocumentHandler->endElement( ELEMENT_NS_ENTRY ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); } void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageItemListDescriptor* pExternalImageList ) throw ( SAXException, RuntimeException ) { - m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_EXTERNALIMAGES ), m_xEmptyList ); + m_xWriteDocumentHandler->startElement( ELEMENT_NS_EXTERNALIMAGES, m_xEmptyList ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); for ( size_t i = 0; i < pExternalImageList->size(); i++ ) @@ -770,7 +770,7 @@ void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageIte } m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_EXTERNALIMAGES ) ); + m_xWriteDocumentHandler->endElement( ELEMENT_NS_EXTERNALIMAGES ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); } @@ -799,10 +799,10 @@ void OWriteImagesDocumentHandler::WriteExternalImage( const ExternalImageItemDes pExternalImage->aCommandURL ); } - m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_EXTERNALENTRY ), xList ); + m_xWriteDocumentHandler->startElement( ELEMENT_NS_EXTERNALENTRY, xList ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( ELEMENT_NS_EXTERNALENTRY ) ); + m_xWriteDocumentHandler->endElement( ELEMENT_NS_EXTERNALENTRY ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); } |