[Libreoffice-commits] .: basctl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Oct 27 08:48:47 PDT 2012
basctl/source/inc/dlgeddef.hxx | 30 +++++++++++++++---------------
basctl/source/inc/localizationmgr.hxx | 22 +++++++++++-----------
basctl/source/inc/managelang.hxx | 10 +++++-----
basctl/source/inc/propbrw.hxx | 2 +-
basctl/source/inc/sbxitem.hxx | 16 ++++++++--------
5 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit b596ce9bb1feafe5c09fa87582d96acceb6ae37d
Author: Ricardo Montania <ricardo at linuxafundo.com.br>
Date: Fri Oct 26 23:35:24 2012 -0200
OUString cleanup finished in basctl
Change-Id: I6d18f5cde7866828ca95ccff702eb86d2e40c58d
Reviewed-on: https://gerrit.libreoffice.org/925
Tested-by: Caolán McNamara <caolanm at redhat.com>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx
index 16fb33e..ec06d6c 100644
--- a/basctl/source/inc/dlgeddef.hxx
+++ b/basctl/source/inc/dlgeddef.hxx
@@ -68,21 +68,21 @@ enum
};
// control properties
-#define DLGED_PROP_BACKGROUNDCOLOR rtl::OUString("BackgroundColor")
-#define DLGED_PROP_DROPDOWN rtl::OUString("Dropdown")
-#define DLGED_PROP_FORMATSSUPPLIER rtl::OUString("FormatsSupplier")
-#define DLGED_PROP_HEIGHT rtl::OUString("Height")
-#define DLGED_PROP_LABEL rtl::OUString("Label")
-#define DLGED_PROP_NAME rtl::OUString("Name")
-#define DLGED_PROP_ORIENTATION rtl::OUString("Orientation")
-#define DLGED_PROP_POSITIONX rtl::OUString("PositionX")
-#define DLGED_PROP_POSITIONY rtl::OUString("PositionY")
-#define DLGED_PROP_STEP rtl::OUString("Step")
-#define DLGED_PROP_TABINDEX rtl::OUString("TabIndex")
-#define DLGED_PROP_TEXTCOLOR rtl::OUString("TextColor")
-#define DLGED_PROP_TEXTLINECOLOR rtl::OUString("TextLineColor")
-#define DLGED_PROP_WIDTH rtl::OUString("Width")
-#define DLGED_PROP_DECORATION rtl::OUString("Decoration")
+#define DLGED_PROP_BACKGROUNDCOLOR "BackgroundColor"
+#define DLGED_PROP_DROPDOWN "Dropdown"
+#define DLGED_PROP_FORMATSSUPPLIER "FormatsSupplier"
+#define DLGED_PROP_HEIGHT "Height"
+#define DLGED_PROP_LABEL "Label"
+#define DLGED_PROP_NAME "Name"
+#define DLGED_PROP_ORIENTATION "Orientation"
+#define DLGED_PROP_POSITIONX "PositionX"
+#define DLGED_PROP_POSITIONY "PositionY"
+#define DLGED_PROP_STEP "Step"
+#define DLGED_PROP_TABINDEX "TabIndex"
+#define DLGED_PROP_TEXTCOLOR "TextColor"
+#define DLGED_PROP_TEXTLINECOLOR "TextLineColor"
+#define DLGED_PROP_WIDTH "Width"
+#define DLGED_PROP_DECORATION "Decoration"
} // namespace basctl
diff --git a/basctl/source/inc/localizationmgr.hxx b/basctl/source/inc/localizationmgr.hxx
index e3da88b..de471a3 100644
--- a/basctl/source/inc/localizationmgr.hxx
+++ b/basctl/source/inc/localizationmgr.hxx
@@ -38,7 +38,7 @@ class LocalizationMgr
Shell* m_pShell;
ScriptDocument m_aDocument;
- ::rtl::OUString m_aLibName;
+ OUString m_aLibName;
::com::sun::star::lang::Locale m_aLocaleBeforeBasicStart;
@@ -53,7 +53,7 @@ class LocalizationMgr
COPY_RESOURCES
};
static sal_Int32 implHandleControlResourceProperties( ::com::sun::star::uno::Any aControlAny,
- const ::rtl::OUString& aDialogName, const ::rtl::OUString& aCtrlName,
+ const OUString& aDialogName, const OUString& aCtrlName,
::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager >
xStringResourceManager, ::com::sun::star::uno::Reference< ::com::sun::star::resource::
XStringResourceResolver > xSourceStringResolver, HandleResourceMode eMode );
@@ -69,7 +69,7 @@ class LocalizationMgr
void implEnableDisableResourceForAllLibraryDialogs( HandleResourceMode eMode );
public:
- LocalizationMgr(Shell*, ScriptDocument const&, rtl::OUString const& aLibName,
+ LocalizationMgr(Shell*, ScriptDocument const&, OUString const& aLibName,
const ::com::sun::star::uno::Reference
< ::com::sun::star::resource::XStringResourceManager >& xStringResourceManager );
::com::sun::star::uno::Reference
@@ -97,21 +97,21 @@ public:
void handleBasicStopped( void );
static void setControlResourceIDsForNewEditorObject( DlgEditor* pEditor,
- ::com::sun::star::uno::Any aControlAny, const ::rtl::OUString& aCtrlName );
+ ::com::sun::star::uno::Any aControlAny, const OUString& aCtrlName );
static void renameControlResourceIDsForEditorObject( DlgEditor* pEditor,
- ::com::sun::star::uno::Any aControlAny, const ::rtl::OUString& aNewCtrlName );
+ ::com::sun::star::uno::Any aControlAny, const OUString& aNewCtrlName );
static void deleteControlResourceIDsForDeletedEditorObject( DlgEditor* pEditor,
- ::com::sun::star::uno::Any aControlAny, const ::rtl::OUString& aCtrlName );
+ ::com::sun::star::uno::Any aControlAny, const OUString& aCtrlName );
- static void setStringResourceAtDialog( const ScriptDocument& rDocument, const ::rtl::OUString& aLibName, const ::rtl::OUString& aDlgName,
+ static void setStringResourceAtDialog( const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aDlgName,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel );
- static void renameStringResourceIDs( const ScriptDocument& rDocument, const ::rtl::OUString& aLibName, const ::rtl::OUString& aDlgName,
+ static void renameStringResourceIDs( const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aDlgName,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel );
- static void removeResourceForDialog( const ScriptDocument& rDocument, const ::rtl::OUString& aLibName, const ::rtl::OUString& aDlgName,
+ static void removeResourceForDialog( const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aDlgName,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel );
static ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager >
@@ -128,13 +128,13 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > xStringResourceManager );
static void copyResourcesForPastedEditorObject( DlgEditor* pEditor,
- ::com::sun::star::uno::Any aControlAny, const ::rtl::OUString& aCtrlName,
+ ::com::sun::star::uno::Any aControlAny, const OUString& aCtrlName,
::com::sun::star::uno::Reference< ::com::sun::star::resource::
XStringResourceResolver > xSourceStringResolver );
static void copyResourceForDroppedDialog(
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > xDialogModel,
- const ::rtl::OUString& aDialogName,
+ const OUString& aDialogName,
::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager > xStringResourceManager,
::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceResolver > xSourceStringResolver );
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index e735d9a..0cd940b 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -34,11 +34,11 @@ class LocalizationMgr;
struct LanguageEntry
{
- ::rtl::OUString m_sLanguage;
+ OUString m_sLanguage;
::com::sun::star::lang::Locale m_aLocale;
bool m_bIsDefault;
- LanguageEntry( const ::rtl::OUString& _rLanguage,
+ LanguageEntry( const OUString& _rLanguage,
const ::com::sun::star::lang::Locale& _rLocale,
bool _bIsDefault ) :
m_sLanguage( _rLanguage ),
@@ -65,9 +65,9 @@ private:
boost::shared_ptr<LocalizationMgr> m_pLocalizationMgr;
- ::rtl::OUString m_sDefLangStr;
- ::rtl::OUString m_sDeleteStr;
- ::rtl::OUString m_sCreateLangStr;
+ OUString m_sDefLangStr;
+ OUString m_sDeleteStr;
+ OUString m_sCreateLangStr;
void Init();
void CalcInfoSize();
diff --git a/basctl/source/inc/propbrw.hxx b/basctl/source/inc/propbrw.hxx
index e8011ef..ece39a9 100644
--- a/basctl/source/inc/propbrw.hxx
+++ b/basctl/source/inc/propbrw.hxx
@@ -69,7 +69,7 @@ protected:
void implSetNewObject(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject);
- ::rtl::OUString GetHeadlineName(
+ OUString GetHeadlineName(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject);
public:
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index f3645dd..1d4b224 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -38,23 +38,23 @@ enum ItemType
class SbxItem : public SfxPoolItem
{
const ScriptDocument m_aDocument;
- const ::rtl::OUString m_aLibName;
- const ::rtl::OUString m_aName;
- const ::rtl::OUString m_aMethodName;
+ const OUString m_aLibName;
+ const OUString m_aName;
+ const OUString m_aMethodName;
ItemType m_eType;
public:
TYPEINFO();
- SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const ::rtl::OUString& aLibName, const ::rtl::OUString& aName, ItemType);
- SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const ::rtl::OUString& aLibName, const ::rtl::OUString& aName, const ::rtl::OUString& aMethodName, ItemType eType);
+ SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, ItemType);
+ SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const OUString& aLibName, const OUString& aName, const OUString& aMethodName, ItemType eType);
virtual SfxPoolItem* Clone(SfxItemPool *pPool = 0) const;
virtual int operator==(const SfxPoolItem&) const;
ScriptDocument const& GetDocument () const { return m_aDocument; }
- rtl::OUString const& GetLibName () const { return m_aLibName; }
- rtl::OUString const& GetName () const { return m_aName; }
- rtl::OUString const& GetMethodName () const { return m_aMethodName; }
+ OUString const& GetLibName () const { return m_aLibName; }
+ OUString const& GetName () const { return m_aName; }
+ OUString const& GetMethodName () const { return m_aMethodName; }
ItemType GetType () const { return m_eType; }
};
More information about the Libreoffice-commits
mailing list