[Libreoffice-commits] .: chart2/source editeng/source filter/source sccomp/source svtools/source svx/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 30 05:04:11 PST 2013
chart2/source/inc/macros.hxx | 3 ---
editeng/source/editeng/textconv.cxx | 2 --
filter/source/msfilter/msocximex.cxx | 2 --
sccomp/source/solver/solver.cxx | 2 --
svtools/source/config/colorcfg.cxx | 1 -
svtools/source/config/fontsubstconfig.cxx | 2 --
svtools/source/config/htmlcfg.cxx | 2 --
svx/source/dialog/rubydialog.cxx | 2 --
svx/source/dialog/svxbmpnumvalueset.cxx | 1 -
svx/source/smarttags/SmartTagMgr.cxx | 2 --
svx/source/table/accessibletableshape.cxx | 2 --
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx | 2 --
12 files changed, 23 deletions(-)
New commits:
commit 1475618fda02a0a2988ca5b9b7979b160399e168
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Wed Jan 30 14:03:02 2013 +0100
remove useless macros
created by incorrect replacements in the previous commit
Change-Id: I15a56ecd201ce202fe933c7d24908923bedc6708
diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx
index 56e0643..e260832 100644
--- a/chart2/source/inc/macros.hxx
+++ b/chart2/source/inc/macros.hxx
@@ -21,9 +21,6 @@
#include <typeinfo>
-/// creates a unicode-string from an ASCII string
-#define constAsciiStr (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( constAsciiStr ) ))
-
/** shows an error-box for an exception ex
else-branch necessary to avoid warning
*/
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 710a24c..d8527cb 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -41,8 +41,6 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
using namespace com::sun::star::linguistic2;
-#define cChar OUString::createFromAscii(cChar)
-
//////////////////////////////////////////////////////////////////////
TextConvWrapper::TextConvWrapper( Window* pWindow,
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index abf8b26..18d08e4 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -30,8 +30,6 @@
using namespace ::com::sun::star;
using namespace ::rtl;
-#define cChar OUString(cChar)
-
OUString sWW8_form( "WW-Standard" );
SvxMSConvertOCXControls::SvxMSConvertOCXControls( const uno::Reference< frame::XModel >& rxModel) : mxModel(rxModel)
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index 660a806..0784fc9 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -62,8 +62,6 @@ using namespace com::sun::star;
using ::rtl::OUString;
-#define constAsciiStr (::rtl::OUString( constAsciiStr ))
-
#define STR_NONNEGATIVE "NonNegative"
#define STR_INTEGER "Integer"
#define STR_TIMEOUT "Timeout"
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index c75a61b..7b13df8 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -48,7 +48,6 @@ using ::rtl::OUString;
namespace svtools
{
-#define cChar OUString::createFromAscii(cChar)
static const sal_Char cColor[] = "/Color";
static const sal_Char cColorSchemes[] = "ColorSchemes/";
sal_Int32 nColorRefCount_Impl = 0;
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index b70ebff..b54cac2 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -34,8 +34,6 @@ using namespace com::sun::star::beans;
using ::rtl::OUString;
-#define cChar OUString::createFromAscii(cChar)
-
const sal_Char cReplacement[] = "Replacement";
const sal_Char cFontPairs[] = "FontPairs";
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index de02320..7cfcddf 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -43,8 +43,6 @@ using namespace com::sun::star::uno;
using ::rtl::OUString;
-#define cChar OUString::createFromAscii(cChar)
-
struct HtmlOptions_Impl
{
::std::list<Link> aList;
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 6b1e523..da49fde 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -51,8 +51,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::container;
using rtl::OUString;
-#define cChar rtl::OUString::createFromAscii(cChar)
-
SFX_IMPL_CHILDWINDOW( SvxRubyChildWindow, SID_RUBY_DIALOG );
static const sal_Char cRubyBaseText[] = "RubyBaseText";
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 05be4aa..c4d7dac 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -64,7 +64,6 @@ using namespace com::sun::star::container;
using namespace com::sun::star::style;
using rtl::OUString;
-#define cChar OUString::createFromAscii(cChar)
#define NUM_PAGETYPE_BULLET 0
#define NUM_PAGETYPE_SINGLENUM 1
#define NUM_PAGETYPE_NUM 2
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index a5eb25d..5bd9f7b 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -48,8 +48,6 @@ using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::i18n;
-#define cChar rtl::OUString::createFromAscii(cChar)
-
SmartTagMgr::SmartTagMgr( const rtl::OUString& rApplicationName )
: maApplicationName( rApplicationName ),
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 00ca92b..0cb9731 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -47,8 +47,6 @@ using namespace ::com::sun::star::drawing;
using namespace ::com::sun::star::table;
using namespace ::com::sun::star::container;
-#define x OUString(RTL_CONSTASCII_USTRINGPARAM(x))
-
namespace accessibility
{
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index 119fdd3..9284d4c 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -43,8 +43,6 @@ using namespace ::com::sun::star;
#define SERVICE_IMPLEMENTATION_NAME ::rtl::OUString("com.sun.star.comp.linguistic2.ChineseTranslationDialog")
#define SERVICE_NAME ::rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog")
-#define cChar rtl::OUString::createFromAscii(cChar)
-
ChineseTranslation_UnoDialog::ChineseTranslation_UnoDialog( const uno::Reference< uno::XComponentContext >& xContext )
: m_xCC( xContext )
, m_xParentWindow( 0 )
More information about the Libreoffice-commits
mailing list