[Libreoffice-commits] core.git: 3 commits - dbaccess/source formula/source include/formula include/svx svx/source sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk vcl/unx
Caolán McNamara
caolanm at redhat.com
Tue Aug 13 01:23:00 PDT 2013
dbaccess/source/ui/control/SqlNameEdit.cxx | 12
dbaccess/source/ui/inc/FieldDescControl.hxx | 4
dbaccess/source/ui/inc/dbtreelistbox.hxx | 2
dbaccess/source/ui/inc/listviewitems.hxx | 2
formula/source/ui/dlg/funcutl.cxx | 2
formula/source/ui/dlg/structpg.cxx | 2
formula/source/ui/dlg/structpg.hxx | 2
include/formula/funcutl.hxx | 2
include/svx/sidebar/ValueSetWithTextControl.hxx | 14
include/svx/svdmark.hxx | 14
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 4
svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx | 6
svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 4
svx/source/sidebar/text/TextCharacterSpacingControl.hxx | 15
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 10
svx/source/svdraw/svdmark.cxx | 14
sw/UIConfig_swriter.mk | 1
sw/inc/helpid.h | 1
sw/source/ui/envelp/label.src | 193 ----
sw/source/ui/envelp/label1.cxx | 132 +--
sw/source/ui/envelp/swuilabimp.hxx | 52 -
sw/source/ui/sidebar/PageMarginControl.cxx | 34
sw/uiconfig/swriter/ui/privateuserpage.ui | 662 ++++++++++++++++
vcl/unx/gtk/a11y/atkwindow.cxx | 2
vcl/unx/gtk/a11y/atkwrapper.cxx | 3
25 files changed, 813 insertions(+), 376 deletions(-)
New commits:
commit 8b961216f42aa4c43d3d0958f81cd8c7e9f4e195
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 12 20:24:39 2013 +0100
convert private user page to .ui
Change-Id: I17f435a7baac206085abd9dd66c061a5ad203786
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 8cb55b4..22c5b20 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -130,6 +130,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/previewzoomdialog \
sw/uiconfig/swriter/ui/printoptionspage \
sw/uiconfig/swriter/ui/printeroptions \
+ sw/uiconfig/swriter/ui/privateuserpage \
sw/uiconfig/swriter/ui/renameautotextdialog \
sw/uiconfig/swriter/ui/renameobjectdialog \
sw/uiconfig/swriter/ui/rowheight \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 0766a2b..2a4760e 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -169,7 +169,6 @@
#define HID_DLG_ADD_IDX_STYLES "SW_HID_DLG_ADD_IDX_STYLES"
#define HID_ADD_STYLES_TLB "SW_HID_ADD_STYLES_TLB"
#define HID_OLE_CHECKLB "SW_HID_OLE_CHECKLB"
-#define HID_TP_PRIVATE_DATA "SW_HID_TP_PRIVATE_DATA"
#define HID_TP_BUSINESS_DATA "SW_HID_TP_BUSINESS_DATA"
diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src
index d19939c..48dee94 100644
--- a/sw/source/ui/envelp/label.src
+++ b/sw/source/ui/envelp/label.src
@@ -115,199 +115,6 @@ String STR_CUSTOM
{
Text [ en-US ] = "[User]";
};
-/********************************************************************/
-TabPage TP_PRIVATE_DATA
-{
- HelpID = HID_TP_PRIVATE_DATA ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Hide = TRUE ;
- FixedLine FL_DATA
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Private data";
- };
- FixedText FT_NAME
- {
- Pos = MAP_APPFONT ( 12 , 16) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "First/Last ~name/Initials";
- };
- Edit ED_FIRSTNAME
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME";
- Pos = MAP_APPFONT ( 105 , 14 ) ;
- Size = MAP_APPFONT ( 55 , 12 ) ;
- Border = TRUE ;
- };
- Edit ED_NAME
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_NAME";
- Pos = MAP_APPFONT ( 163 , 14 ) ;
- Size = MAP_APPFONT ( 55 , 12 ) ;
- Border = TRUE ;
- };
- Edit ED_SHORTCUT
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT";
- Pos = MAP_APPFONT ( 221 , 14 ) ;
- Size = MAP_APPFONT ( 27 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_NAME_2
- {
- Pos = MAP_APPFONT ( 12 , 32) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "First/Last ~name/Initials 2";
- };
- Edit ED_FIRSTNAME_2
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME_2";
- Pos = MAP_APPFONT ( 105 , 30 ) ;
- Size = MAP_APPFONT ( 55 , 12 ) ;
- Border = TRUE ;
- };
- Edit ED_NAME_2
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_NAME_2";
- Pos = MAP_APPFONT ( 163 , 30 ) ;
- Size = MAP_APPFONT ( 55 , 12 ) ;
- Border = TRUE ;
- };
- Edit ED_SHORTCUT_2
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT_2";
- Pos = MAP_APPFONT ( 221 , 30 ) ;
- Size = MAP_APPFONT ( 27 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_STREET
- {
- Pos = MAP_APPFONT ( 12 , 48) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "S~treet";
- };
- Edit ED_STREET
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_STREET";
- Pos = MAP_APPFONT ( 105 , 46 ) ;
- Size = MAP_APPFONT ( 143 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_ZIPCITY
- {
- Pos = MAP_APPFONT ( 12 , 64) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Zip/Cit~y";
- };
- Edit ED_ZIP
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_ZIP";
- Pos = MAP_APPFONT ( 105 , 62 ) ;
- Size = MAP_APPFONT ( 50 , 12 ) ;
- Border = TRUE ;
- };
- Edit ED_CITY
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_CITY";
- Pos = MAP_APPFONT ( 158 , 62 ) ;
- Size = MAP_APPFONT ( 90 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_COUNTRYSTATE
- {
- Pos = MAP_APPFONT ( 12 , 80) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Co~untry/State";
- };
- Edit ED_COUNTRY
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_COUNTRY";
- Pos = MAP_APPFONT ( 105 , 78 ) ;
- Size = MAP_APPFONT ( 71 , 12 ) ;
- Border = TRUE ;
- };
- Edit ED_STATE
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_STATE";
- Pos = MAP_APPFONT ( 179 , 78 ) ;
- Size = MAP_APPFONT ( 69 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_TITLEPROF
- {
- Pos = MAP_APPFONT ( 12 , 96) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Title/~Profession";
- };
- Edit ED_TITLE
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_TITLE";
- Pos = MAP_APPFONT ( 105 , 94 ) ;
- Size = MAP_APPFONT ( 71 , 12 ) ;
- Border = TRUE ;
- };
- Edit ED_PROFESSION
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_PROFESSION";
- Pos = MAP_APPFONT ( 179 , 94 ) ;
- Size = MAP_APPFONT ( 69 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_PHONE_MOBILE
- {
- Pos = MAP_APPFONT ( 12 , 112) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Phone/Mobile";
- };
- Edit ED_PHONE
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_PHONE";
- Pos = MAP_APPFONT ( 105 , 110 ) ;
- Size = MAP_APPFONT ( 71 , 12 ) ;
- Border = TRUE ;
- };
- Edit ED_MOBILE
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_MOBILE";
- Pos = MAP_APPFONT ( 179 , 110 ) ;
- Size = MAP_APPFONT ( 69 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_FAX
- {
- Pos = MAP_APPFONT ( 12 , 128) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Fa~x";
- };
- Edit ED_FAX
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_FAX";
- Pos = MAP_APPFONT ( 105 , 126 ) ;
- Size = MAP_APPFONT ( 143 , 12 ) ;
- Border = TRUE ;
- };
- FixedText FT_WWWMAIL
- {
- Pos = MAP_APPFONT ( 12 , 144) ;
- Size = MAP_APPFONT ( 90 , 8 ) ;
- Text [ en-US ] = "Homepage / e-mail";
- };
- Edit ED_WWW
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_WWW";
- Pos = MAP_APPFONT ( 105 , 142) ;
- Size = MAP_APPFONT ( 71 , 12 ) ;
- Border = TRUE ;
- };
- Edit ED_MAIL
- {
- HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_MAIL";
- Pos = MAP_APPFONT ( 179 , 142) ;
- Size = MAP_APPFONT ( 69 , 12 ) ;
- Border = TRUE ;
- };
-};
TabPage TP_BUSINESS_DATA
{
HelpID = HID_TP_BUSINESS_DATA;
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 188ef9f..b4975ef 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -708,48 +708,32 @@ void SwVisitingCardPage::Reset(const SfxItemSet& rSet)
}
}
-SwPrivateDataPage::SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet) :
- SfxTabPage(pParent, SW_RES(TP_PRIVATE_DATA), rSet),
- aDataFL (this, SW_RES( FL_DATA )),
-
- aNameFT (this, SW_RES( FT_NAME )),
- aFirstNameED (this, SW_RES( ED_FIRSTNAME )),
- aNameED (this, SW_RES( ED_NAME )),
- aShortCutED (this, SW_RES( ED_SHORTCUT )),
-
- aName2FT (this, SW_RES( FT_NAME_2 )),
- aFirstName2ED (this, SW_RES( ED_FIRSTNAME_2)),
- aName2ED (this, SW_RES( ED_NAME_2 )),
- aShortCut2ED (this, SW_RES( ED_SHORTCUT_2 )),
+SwPrivateDataPage::SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet)
+ : SfxTabPage(pParent, "PrivateUserPage",
+ "modules/swriter/ui/privateuserpage.ui", rSet)
+{
+ get(m_pFirstNameED, "firstname");
+ get(m_pNameED, "lastname");
+ get(m_pShortCutED, "shortname");
+ get(m_pFirstName2ED, "firstname2");
+ get(m_pName2ED, "lastname2");
+ get(m_pShortCut2ED, "shortname2");
+ get(m_pStreetED, "street");
+ get(m_pZipED, "izip");
+ get(m_pCityED, "icity");
+ get(m_pCountryED, "country");
+ get(m_pStateED, "state");
+ get(m_pTitleED, "title");
+ get(m_pProfessionED, "job");
+ get(m_pPhoneED, "phone");
+ get(m_pMobilePhoneED, "mobile");
+ get(m_pFaxED, "fax");
+ get(m_pHomePageED, "url");
+ get(m_pMailED, "email");
- aStreetFT (this, SW_RES( FT_STREET )),
- aStreetED (this, SW_RES( ED_STREET )),
- aZipCityFT (this, SW_RES( FT_ZIPCITY )),
- aZipED (this, SW_RES( ED_ZIP )),
- aCityED (this, SW_RES( ED_CITY )),
- aCountryStateFT (this, SW_RES( FT_COUNTRYSTATE )),
- aCountryED (this, SW_RES( ED_COUNTRY )),
- aStateED (this, SW_RES( ED_STATE )),
- aTitleProfessionFT (this, SW_RES( FT_TITLEPROF )),
- aTitleED (this, SW_RES( ED_TITLE )),
- aProfessionED (this, SW_RES( ED_PROFESSION )),
- aPhoneFT (this, SW_RES( FT_PHONE_MOBILE )),
- aPhoneED (this, SW_RES( ED_PHONE )),
- aMobilePhoneED (this, SW_RES( ED_MOBILE )),
- aFaxFT (this, SW_RES( FT_FAX )),
- aFaxED (this, SW_RES( ED_FAX )),
- aWWWMailFT (this, SW_RES( FT_WWWMAIL )),
- aHomePageED (this, SW_RES( ED_WWW )),
- aMailED (this, SW_RES( ED_MAIL ))
-{
- FreeResource();
SetExchangeSupport();
}
-SwPrivateDataPage::~SwPrivateDataPage()
-{
-}
-
SfxTabPage* SwPrivateDataPage::Create(Window* pParent, const SfxItemSet& rSet)
{
return new SwPrivateDataPage(pParent, rSet);
@@ -771,24 +755,24 @@ sal_Bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet)
{
SwLabItem aItem = (const SwLabItem&) GetTabDialog()->GetExampleSet()->Get(FN_LABEL);
- aItem.aPrivFirstName = aFirstNameED .GetText();
- aItem.aPrivName = aNameED .GetText( );
- aItem.aPrivShortCut = aShortCutED .GetText( );
- aItem.aPrivFirstName2 = aFirstName2ED .GetText();
- aItem.aPrivName2 = aName2ED .GetText( );
- aItem.aPrivShortCut2 = aShortCut2ED .GetText( );
- aItem.aPrivStreet = aStreetED .GetText( );
- aItem.aPrivZip = aZipED .GetText( );
- aItem.aPrivCity = aCityED .GetText( );
- aItem.aPrivCountry = aCountryED .GetText( );
- aItem.aPrivState = aStateED .GetText( );
- aItem.aPrivTitle = aTitleED .GetText( );
- aItem.aPrivProfession= aProfessionED.GetText( );
- aItem.aPrivPhone = aPhoneED .GetText( );
- aItem.aPrivMobile = aMobilePhoneED.GetText( );
- aItem.aPrivFax = aFaxED .GetText( );
- aItem.aPrivWWW = aHomePageED .GetText( );
- aItem.aPrivMail = aMailED .GetText( );
+ aItem.aPrivFirstName = m_pFirstNameED->GetText();
+ aItem.aPrivName = m_pNameED->GetText( );
+ aItem.aPrivShortCut = m_pShortCutED->GetText( );
+ aItem.aPrivFirstName2 = m_pFirstName2ED->GetText();
+ aItem.aPrivName2 = m_pName2ED->GetText( );
+ aItem.aPrivShortCut2 = m_pShortCut2ED->GetText( );
+ aItem.aPrivStreet = m_pStreetED->GetText( );
+ aItem.aPrivZip = m_pZipED->GetText( );
+ aItem.aPrivCity = m_pCityED->GetText( );
+ aItem.aPrivCountry = m_pCountryED->GetText( );
+ aItem.aPrivState = m_pStateED->GetText( );
+ aItem.aPrivTitle = m_pTitleED->GetText( );
+ aItem.aPrivProfession= m_pProfessionED->GetText( );
+ aItem.aPrivPhone = m_pPhoneED->GetText( );
+ aItem.aPrivMobile = m_pMobilePhoneED->GetText( );
+ aItem.aPrivFax = m_pFaxED->GetText( );
+ aItem.aPrivWWW = m_pHomePageED->GetText( );
+ aItem.aPrivMail = m_pMailED->GetText( );
rSet.Put(aItem);
return sal_True;
@@ -797,24 +781,24 @@ sal_Bool SwPrivateDataPage::FillItemSet(SfxItemSet& rSet)
void SwPrivateDataPage::Reset(const SfxItemSet& rSet)
{
const SwLabItem& aItem = (const SwLabItem&) rSet.Get(FN_LABEL);
- aFirstNameED.SetText(aItem.aPrivFirstName);
- aNameED .SetText(aItem.aPrivName);
- aShortCutED .SetText(aItem.aPrivShortCut);
- aFirstName2ED.SetText(aItem.aPrivFirstName2);
- aName2ED .SetText(aItem.aPrivName2);
- aShortCut2ED .SetText(aItem.aPrivShortCut2);
- aStreetED .SetText(aItem.aPrivStreet);
- aZipED .SetText(aItem.aPrivZip);
- aCityED .SetText(aItem.aPrivCity);
- aCountryED .SetText(aItem.aPrivCountry);
- aStateED .SetText(aItem.aPrivState);
- aTitleED .SetText(aItem.aPrivTitle);
- aProfessionED.SetText(aItem.aPrivProfession);
- aPhoneED .SetText(aItem.aPrivPhone);
- aMobilePhoneED.SetText(aItem.aPrivMobile);
- aFaxED .SetText(aItem.aPrivFax);
- aHomePageED .SetText(aItem.aPrivWWW);
- aMailED .SetText(aItem.aPrivMail);
+ m_pFirstNameED->SetText(aItem.aPrivFirstName);
+ m_pNameED->SetText(aItem.aPrivName);
+ m_pShortCutED->SetText(aItem.aPrivShortCut);
+ m_pFirstName2ED->SetText(aItem.aPrivFirstName2);
+ m_pName2ED->SetText(aItem.aPrivName2);
+ m_pShortCut2ED->SetText(aItem.aPrivShortCut2);
+ m_pStreetED->SetText(aItem.aPrivStreet);
+ m_pZipED->SetText(aItem.aPrivZip);
+ m_pCityED->SetText(aItem.aPrivCity);
+ m_pCountryED->SetText(aItem.aPrivCountry);
+ m_pStateED->SetText(aItem.aPrivState);
+ m_pTitleED->SetText(aItem.aPrivTitle);
+ m_pProfessionED->SetText(aItem.aPrivProfession);
+ m_pPhoneED->SetText(aItem.aPrivPhone);
+ m_pMobilePhoneED->SetText(aItem.aPrivMobile);
+ m_pFaxED->SetText(aItem.aPrivFax);
+ m_pHomePageED->SetText(aItem.aPrivWWW);
+ m_pMailED->SetText(aItem.aPrivMail);
}
SwBusinessDataPage::SwBusinessDataPage(Window* pParent, const SfxItemSet& rSet) :
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 977e2f9..b4b4596 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -126,40 +126,28 @@ public:
class SwPrivateDataPage : public SfxTabPage
{
- FixedLine aDataFL;
-
- FixedText aNameFT;
- Edit aFirstNameED;
- Edit aNameED;
- Edit aShortCutED;
-
- FixedText aName2FT;
- Edit aFirstName2ED;
- Edit aName2ED;
- Edit aShortCut2ED;
-
- FixedText aStreetFT;
- Edit aStreetED;
- FixedText aZipCityFT;
- Edit aZipED;
- Edit aCityED;
- FixedText aCountryStateFT;
- Edit aCountryED;
- Edit aStateED;
- FixedText aTitleProfessionFT;
- Edit aTitleED;
- Edit aProfessionED;
- FixedText aPhoneFT;
- Edit aPhoneED;
- Edit aMobilePhoneED;
- FixedText aFaxFT;
- Edit aFaxED;
- FixedText aWWWMailFT;
- Edit aHomePageED;
- Edit aMailED;
+ Edit* m_pFirstNameED;
+ Edit* m_pNameED;
+ Edit* m_pShortCutED;
+
+ Edit* m_pFirstName2ED;
+ Edit* m_pName2ED;
+ Edit* m_pShortCut2ED;
+
+ Edit* m_pStreetED;
+ Edit* m_pZipED;
+ Edit* m_pCityED;
+ Edit* m_pCountryED;
+ Edit* m_pStateED;
+ Edit* m_pTitleED;
+ Edit* m_pProfessionED;
+ Edit* m_pPhoneED;
+ Edit* m_pMobilePhoneED;
+ Edit* m_pFaxED;
+ Edit* m_pHomePageED;
+ Edit* m_pMailED;
SwPrivateDataPage(Window* pParent, const SfxItemSet& rSet);
- ~SwPrivateDataPage();
using TabPage::ActivatePage;
using TabPage::DeactivatePage;
diff --git a/sw/uiconfig/swriter/ui/privateuserpage.ui b/sw/uiconfig/swriter/ui/privateuserpage.ui
new file mode 100644
index 0000000..5d325ce
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/privateuserpage.ui
@@ -0,0 +1,662 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkFrame" id="PrivateUserPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="nameft">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">First/Last _name/Initials</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">firstname</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="streetft">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Street</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">street</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="countryft">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Co_untry/State</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">country</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="titleft">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Title/Profession</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">title</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="phoneft">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Fa_x</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">fax</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="phoneft-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes">Home telephone number</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="faxft">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Homepage / E-mail</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">url</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="firstname">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="firstname-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">First name</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="lastname">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="lastname-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Last name</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="shortname">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="invisible_char">•</property>
+ <property name="width_chars">7</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="shortname-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Initials</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid5">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="title">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="title-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Title</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="job">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="job-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Position</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid6">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="fax">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="fax-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Home telephone number</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid7">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="url">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="url-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">FAX number</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="email">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="email-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">email address</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="eastnameft">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">First/Last _name/Initials 2</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">firstname2</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid9">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="firstname2">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="firstname2-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Last name</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="lastname2">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="lastname2-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">First name</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="shortname2">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="invisible_char">•</property>
+ <property name="width_chars">7</property>
+ <property name="invisible_char_set">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="shortname2-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Initials</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="icityft">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Zip/City</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">izip</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid11">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="icity">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="icity-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">City</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="izip">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="invisible_char">•</property>
+ <property name="width_chars">15</property>
+ <property name="invisible_char_set">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="izip-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Zip code</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkEntry" id="street">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid12">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="country">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="state">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="titleft1">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Phone/Mobile</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">title</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkEntry" id="phone">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="phone-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Title</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="mobile">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</property>
+ <property name="invisible_char_set">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="mobile-atkobject">
+ <property name="AtkObject::accessible-name" translatable="yes">Position</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Private date</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+</interface>
commit 6b2cc1eb6c7404d6934aad2d2c78555a45c9b4a8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 12 20:13:49 2013 +0100
XubString->OUString
Change-Id: I1db6254b23c5203c20c168989656d320f86a3bb9
diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx
index 2e28ddd..6d815fc 100644
--- a/dbaccess/source/ui/control/SqlNameEdit.cxx
+++ b/dbaccess/source/ui/control/SqlNameEdit.cxx
@@ -38,18 +38,18 @@ namespace dbaui
sal_Bool bCorrected = sal_False;
if ( m_bCheck )
{
- XubString sText = _sToCheck;
- xub_StrLen nMatch = 0;
- for ( xub_StrLen i=nMatch;i < sText.Len(); ++i )
+ OUString sText = _sToCheck;
+ sal_Int32 nMatch = 0;
+ for (sal_Int32 i = nMatch; i < sText.getLength(); ++i)
{
- if ( !isCharOk( sText.GetBuffer()[i], i == 0, m_bOnlyUpperCase, m_sAllowedChars ) )
+ if ( !isCharOk( sText[i], i == 0, m_bOnlyUpperCase, m_sAllowedChars ) )
{
- _rsCorrected += sText.Copy( nMatch, i - nMatch );
+ _rsCorrected += sText.copy(nMatch, i - nMatch);
bCorrected = sal_True;
nMatch = i + 1;
}
}
- _rsCorrected += sText.Copy( nMatch, sText.Len() - nMatch );
+ _rsCorrected += sText.copy( nMatch, sText.getLength() - nMatch );
}
return bCorrected;
}
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 5440908..c05021a 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -102,8 +102,8 @@ namespace dbaui
TOTypeInfoSP m_pPreviousType;
short m_nPos;
- XubString aYes;
- XubString aNo;
+ OUString aYes;
+ OUString aNo;
long m_nOldVThumb;
long m_nOldHThumb;
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index d15c7b4..16ad590 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -35,7 +35,7 @@ namespace dbaui
struct DBTreeEditedEntry
{
SvTreeListEntry* pEntry;
- XubString aNewText;
+ OUString aNewText;
};
class IEntryFilter
diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx
index 2dc6dd1..f9a8178 100644
--- a/dbaccess/source/ui/inc/listviewitems.hxx
+++ b/dbaccess/source/ui/inc/listviewitems.hxx
@@ -37,7 +37,7 @@ namespace dbaui
sal_Bool m_bEmphasized;
public:
- OBoldListboxString(SvTreeListEntry* _pEntry, sal_uInt16 _nFlags, const XubString& _rStr)
+ OBoldListboxString(SvTreeListEntry* _pEntry, sal_uInt16 _nFlags, const OUString& _rStr)
:SvLBoxString(_pEntry, _nFlags, _rStr)
,m_bEmphasized(sal_False)
{
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index eb2bb81..3b9556a 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -896,7 +896,7 @@ void RefEdit::SetRefValid(bool bValid)
}
}
-void RefEdit::SetText( const XubString& rStr )
+void RefEdit::SetText(const OUString& rStr)
{
Edit::SetText( rStr );
UpdateHdl( &aTimer );
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 32f0de7..d672f73 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -45,7 +45,7 @@ StructListBox::StructListBox(Window* pParent, const ResId& rResId ):
}
SvTreeListEntry* StructListBox::InsertStaticEntry(
- const XubString& rText,
+ const OUString& rText,
const Image& rEntryImg,
SvTreeListEntry* pParent, sal_uLong nPos, IFormulaToken* pToken )
{
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index c68459b..fe68eea 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -52,7 +52,7 @@ public:
/** Inserts an entry with static image (no difference between collapsed/expanded). */
SvTreeListEntry* InsertStaticEntry(
- const XubString& rText,
+ const OUString& rText,
const Image& rEntryImg,
SvTreeListEntry* pParent = NULL,
sal_uLong nPos = LIST_APPEND,
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 0d802f1..b34d56b 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -59,7 +59,7 @@ public:
void SetRefValid(bool bValid);
using Edit::SetText;
- virtual void SetText( const XubString& rStr );
+ void SetText( const OUString& rStr );
virtual void Modify();
void StartUpdateData();
diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx
index d0e524c..fe8a7aa 100644
--- a/include/svx/sidebar/ValueSetWithTextControl.hxx
+++ b/include/svx/sidebar/ValueSetWithTextControl.hxx
@@ -78,8 +78,8 @@ public:
void AddItem(
const Image& rItemImage,
const Image* pSelectedItemImage,
- const XubString& rItemText,
- const XubString* pItemHelpText );
+ const OUString& rItemText,
+ const OUString* pItemHelpText );
// replace item images for control type IMAGE_TEXT
void ReplaceItemImages(
@@ -92,9 +92,9 @@ public:
// @param pItemHelpText
// help text is optional. if not provided, it is the same as the item text
void AddItem(
- const XubString& rItemText,
- const XubString& rItemText2,
- const XubString* pItemHelpText );
+ const OUString& rItemText,
+ const OUString& rItemText2,
+ const OUString* pItemHelpText );
virtual void UserDraw( const UserDrawEvent& rUDEvt );
@@ -103,8 +103,8 @@ private:
{
Image maItemImage;
Image maSelectedItemImage;
- XubString maItemText;
- XubString maItemText2;
+ OUString maItemText;
+ OUString maItemText2;
};
typedef ::std::vector< ValueSetWithTextItem > tItemList;
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
index 09b4bfa..faeae35 100644
--- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
@@ -168,9 +168,9 @@ class SVX_DLLPUBLIC SdrMarkList
protected:
std::vector<SdrMark*> maList;
- String maMarkName;
- String maPointName;
- String maGluePointName;
+ OUString maMarkName;
+ OUString maPointName;
+ OUString maGluePointName;
sal_Bool mbPointNameOk;
sal_Bool mbGluePointNameOk;
@@ -182,7 +182,7 @@ private:
SVX_DLLPRIVATE void ImpForceSort();
private:
- SVX_DLLPRIVATE const XubString& GetPointMarkDescription(sal_Bool bGlue) const;
+ SVX_DLLPRIVATE const OUString& GetPointMarkDescription(sal_Bool bGlue) const;
public:
SdrMarkList()
@@ -235,13 +235,13 @@ public:
// A verbal description of selected objects e.g.:
// "27 Lines", "12 Objects", "Polygon" or even "Not an object"
- const String& GetMarkDescription() const;
- const String& GetPointMarkDescription() const
+ const OUString& GetMarkDescription() const;
+ const OUString& GetPointMarkDescription() const
{
return GetPointMarkDescription(sal_False);
}
- const String& GetGluePointMarkDescription() const
+ const OUString& GetGluePointMarkDescription() const
{
return GetPointMarkDescription(sal_True);
}
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index fabb208..865377f 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -126,13 +126,13 @@ void ParaLineSpacingControl::initial()
mpImgSel[2] = maSelSpacing15;
mpImgSel[3] = maSelSpacing2;
- mpStr = new XubString[4];
+ mpStr = new OUString[4];
mpStr[0] = SVX_RESSTR(STR_SPACING1);
mpStr[1] = SVX_RESSTR(STR_SPACING115);
mpStr[2] = SVX_RESSTR(STR_SPACING15);
mpStr[3] = SVX_RESSTR(STR_SPACING2);
- mpStrTip = new XubString[4];
+ mpStrTip = new OUString[4];
mpStrTip[0] = SVX_RESSTR(STR_LS_SINGLE);
mpStrTip[1] = SVX_RESSTR(STR_LS_115);
mpStrTip[2] = SVX_RESSTR(STR_LS_15);
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
index fc540c0..2e29e8b 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
@@ -88,12 +88,12 @@ private:
Image maSelSelHanging;
Image maImgCus;
Image maImgCusGrey;
- XubString maStrCus;
+ OUString maStrCus;
Image* mpImg;
Image* mpImgSel;
- XubString* mpStr;
- XubString* mpStrTip;
+ OUString* mpStr;
+ OUString* mpStrTip;
String maLine;
String maOf;
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 1f8b722..bf5dd41 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -111,7 +111,7 @@ void TextCharacterSpacingControl::initial()
mpImgSel[3] = Image(SVX_RES(IMG_LOOSE_S));
mpImgSel[4] = Image(SVX_RES(IMG_VERY_LOOSE_S));
- mpStr = new XubString[5];
+ mpStr = new OUString[5];
mpStr[0] = SVX_RESSTR(STR_VERY_TIGHT);
mpStr[1] = SVX_RESSTR(STR_TIGHT);
mpStr[2] = SVX_RESSTR(STR_NORMAL);
@@ -119,7 +119,7 @@ void TextCharacterSpacingControl::initial()
mpStr[4] = SVX_RESSTR(STR_VERY_LOOSE);
- mpStrTip = new XubString[5];
+ mpStrTip = new OUString[5];
mpStrTip[0] = SVX_RESSTR(STR_VERY_TIGHT_TIP);
mpStrTip[1] = SVX_RESSTR(STR_TIGHT_TIP);
mpStrTip[2] = SVX_RESSTR(STR_NORMAL_TIP);
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
index f876f79..b47af09 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
@@ -61,7 +61,6 @@ private:
ValueSetWithTextControl maVSSpacing;
FixedText maLastCus;
-// Control maBorder;
FixedText maFTSpacing;
ListBox maLBKerning;
@@ -70,16 +69,16 @@ private:
Image* mpImg;
Image* mpImgSel;
- XubString* mpStr;
- XubString* mpStrTip;
+ OUString* mpStr;
+ OUString* mpStrTip;
Image maImgCus;
Image maImgCusGrey;
- XubString maStrCus;
- XubString maStrCusE; //add
- XubString maStrCusC; //add
- XubString maStrCusN; //add
- XubString maStrUnit; //add
+ OUString maStrCus;
+ OUString maStrCusE;
+ OUString maStrCusC;
+ OUString maStrCusN;
+ OUString maStrUnit;
long mnCustomKern;
short mnLastCus;
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 91a1848..37b5324 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -88,8 +88,8 @@ ValueSetWithTextControl::~ValueSetWithTextControl(void)
void ValueSetWithTextControl::AddItem(
const Image& rItemImage,
const Image* pSelectedItemImage,
- const XubString& rItemText,
- const XubString* pItemHelpText )
+ const OUString& rItemText,
+ const OUString* pItemHelpText )
{
if ( meControlType != IMAGE_TEXT )
{
@@ -112,9 +112,9 @@ void ValueSetWithTextControl::AddItem(
void ValueSetWithTextControl::AddItem(
- const XubString& rItemText,
- const XubString& rItemText2,
- const XubString* pItemHelpText )
+ const OUString& rItemText,
+ const OUString& rItemText2,
+ const OUString* pItemHelpText )
{
if ( meControlType != TEXT_TEXT )
{
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 1c6fb1f..1c7bf49 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -540,7 +540,7 @@ sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV)
return bChgd;
}
-const XubString& SdrMarkList::GetMarkDescription() const
+const OUString& SdrMarkList::GetMarkDescription() const
{
sal_uLong nAnz(GetMarkCount());
@@ -563,7 +563,7 @@ const XubString& SdrMarkList::GetMarkDescription() const
if(!nAnz)
{
- ((SdrMarkList*)(this))->maMarkName = ImpGetResStr(STR_ObjNameNoObj);
+ const_cast<SdrMarkList*>(this)->maMarkName = ImpGetResStr(STR_ObjNameNoObj);
}
else if(1L == nAnz)
{
@@ -596,17 +596,17 @@ const XubString& SdrMarkList::GetMarkDescription() const
aNam.Insert(OUString::number( nAnz ), 0);
}
- ((SdrMarkList*)(this))->maMarkName = aNam;
- ((SdrMarkList*)(this))->mbNameOk = sal_True;
+ const_cast<SdrMarkList*>(this)->maMarkName = aNam;
+ const_cast<SdrMarkList*>(this)->mbNameOk = sal_True;
}
return maMarkName;
}
-const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
+const OUString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
{
sal_Bool& rNameOk = (sal_Bool&)(bGlue ? mbGluePointNameOk : mbPointNameOk);
- XubString& rName = (XubString&)(bGlue ? maGluePointName : maPointName);
+ OUString& rName = const_cast<OUString&>(bGlue ? maGluePointName : maPointName);
sal_uLong nMarkAnz(GetMarkCount());
sal_uLong nMarkPtAnz(0L);
sal_uLong nMarkPtObjAnz(0L);
@@ -650,7 +650,7 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const
if(!nMarkPtObjAnz)
{
- rName.Erase();
+ rName = OUString();
rNameOk = sal_True;
}
else if(!rNameOk)
diff --git a/sw/source/ui/sidebar/PageMarginControl.cxx b/sw/source/ui/sidebar/PageMarginControl.cxx
index 89e0ca0..05822c1 100644
--- a/sw/source/ui/sidebar/PageMarginControl.cxx
+++ b/sw/source/ui/sidebar/PageMarginControl.cxx
@@ -167,14 +167,14 @@ void PageMarginControl::FillValueSet(
const bool bLandscape,
const bool bUserCustomValuesAvailable )
{
- const XubString aLeft = SW_RES(STR_MARGIN_TOOLTIP_LEFT);
- const XubString aRight = SW_RES(STR_MARGIN_TOOLTIP_RIGHT);
- const XubString aTop = SW_RES(STR_MARGIN_TOOLTIP_TOP);
- const XubString aBottom = SW_RES(STR_MARGIN_TOOLTIP_BOT);
+ const OUString aLeft = SW_RESSTR(STR_MARGIN_TOOLTIP_LEFT);
+ const OUString aRight = SW_RESSTR(STR_MARGIN_TOOLTIP_RIGHT);
+ const OUString aTop = SW_RESSTR(STR_MARGIN_TOOLTIP_TOP);
+ const OUString aBottom = SW_RESSTR(STR_MARGIN_TOOLTIP_BOT);
SetMetricValue( maWidthHeightField, SWPAGE_NARROW_VALUE, meUnit );
- const XubString aNarrowValText = maWidthHeightField.GetText();
- XubString aHelpText = aLeft;
+ const OUString aNarrowValText = maWidthHeightField.GetText();
+ OUString aHelpText = aLeft;
aHelpText += aNarrowValText;
aHelpText += aRight;
aHelpText += aNarrowValText;
@@ -184,10 +184,10 @@ void PageMarginControl::FillValueSet(
aHelpText += aNarrowValText;
mpMarginValueSet->AddItem(
(bLandscape ? SW_RES(IMG_NARROW_L) : SW_RES(IMG_NARROW) ), 0,
- SW_RES(STR_NARROW), &aHelpText );
+ SW_RESSTR(STR_NARROW), &aHelpText );
SetMetricValue( maWidthHeightField, SWPAGE_NORMAL_VALUE, meUnit );
- const XubString aNormalValText = maWidthHeightField.GetText();
+ const OUString aNormalValText = maWidthHeightField.GetText();
aHelpText = aLeft;
aHelpText += aNormalValText;
aHelpText += aRight;
@@ -198,12 +198,12 @@ void PageMarginControl::FillValueSet(
aHelpText += aNormalValText;
mpMarginValueSet->AddItem(
(bLandscape ? SW_RES(IMG_NORMAL_L) : SW_RES(IMG_NORMAL) ), 0,
- SW_RES(STR_NORMAL), &aHelpText );
+ SW_RESSTR(STR_NORMAL), &aHelpText );
SetMetricValue( maWidthHeightField, SWPAGE_WIDE_VALUE1, meUnit );
- const XubString aWide1ValText = maWidthHeightField.GetText();
+ const OUString aWide1ValText = maWidthHeightField.GetText();
SetMetricValue( maWidthHeightField, SWPAGE_WIDE_VALUE2, meUnit );
- const XubString aWide2ValText = maWidthHeightField.GetText();
+ const OUString aWide2ValText = maWidthHeightField.GetText();
aHelpText = aLeft;
aHelpText += aWide2ValText;
aHelpText += aRight;
@@ -214,13 +214,13 @@ void PageMarginControl::FillValueSet(
aHelpText += aWide1ValText;
mpMarginValueSet->AddItem(
(bLandscape ? SW_RES(IMG_WIDE_L) : SW_RES(IMG_WIDE) ), 0,
- SW_RES(STR_WIDE), &aHelpText );
+ SW_RESSTR(STR_WIDE), &aHelpText );
- const XubString aInner = SW_RES(STR_MARGIN_TOOLTIP_INNER);
- const XubString aOuter = SW_RES(STR_MARGIN_TOOLTIP_OUTER);
+ const OUString aInner = SW_RESSTR(STR_MARGIN_TOOLTIP_INNER);
+ const OUString aOuter = SW_RESSTR(STR_MARGIN_TOOLTIP_OUTER);
SetMetricValue( maWidthHeightField, SWPAGE_WIDE_VALUE3, meUnit );
- const XubString aWide3ValText = maWidthHeightField.GetText();
+ const OUString aWide3ValText = maWidthHeightField.GetText();
aHelpText = aInner;
aHelpText += aWide3ValText;
aHelpText += aOuter;
@@ -231,7 +231,7 @@ void PageMarginControl::FillValueSet(
aHelpText += aWide1ValText;
mpMarginValueSet->AddItem(
(bLandscape ? SW_RES(IMG_MIRRORED_L) : SW_RES(IMG_MIRRORED) ), 0,
- SW_RES(STR_MIRRORED), &aHelpText );
+ SW_RESSTR(STR_MIRRORED), &aHelpText );
if ( bUserCustomValuesAvailable )
{
@@ -254,7 +254,7 @@ void PageMarginControl::FillValueSet(
}
mpMarginValueSet->AddItem(
(bUserCustomValuesAvailable ? SW_RES(IMG_CUSTOM) : SW_RES(IMG_CUSTOM_DIS) ), 0,
- SW_RES(STR_LCVALUE), &aHelpText );
+ SW_RESSTR(STR_LCVALUE), &aHelpText );
}
commit 89253a0c258c1107f598e5a37470ecb09055a895
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 12 15:08:14 2013 +0100
downgrade Unknown type: GailWindow warning to info
a11y definitely works, so lets de-noise startup
Change-Id: Ibea41248955442e062700d07fbe9a70e11479fe3
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index fd396c8..0c927a5 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -278,7 +278,7 @@ ooo_window_wrapper_get_type (void)
if( ! parent_type )
{
- g_warning( "Unknown type: GailWindow" );
+ SAL_INFO("vcl.a11y", "Unknown type: GailWindow");
parent_type = ATK_TYPE_OBJECT;
}
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 4c9d5d6..a112d4f 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -809,9 +809,6 @@ atk_object_wrapper_new( const ::com::sun::star::uno::Reference< ::com::sun::star
*/
uno::Reference< accessibility::XAccessible > xParent( xContext->getAccessibleParent() );
- /* The top-level objects should never be of this class */
- OSL_ASSERT( xParent.is() );
-
if( xParent.is() )
atk_obj->accessible_parent = atk_object_wrapper_ref( xParent );
}
More information about the Libreoffice-commits
mailing list