summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx2
-rw-r--r--sfx2/source/dialog/basedlgs.cxx2
-rw-r--r--sfx2/source/dialog/tabdlg.cxx2
-rw-r--r--sw/inc/swabstdlg.hxx8
-rw-r--r--sw/inc/swtypes.hxx1
-rw-r--r--sw/source/ui/config/optpage.cxx2
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx2
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx8
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx8
-rw-r--r--sw/source/ui/inc/wrtsh.hxx4
-rw-r--r--sw/source/ui/index/cntex.cxx2
-rw-r--r--sw/source/ui/wrtsh/wrtsh2.cxx10
12 files changed, 25 insertions, 26 deletions
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 5092c43265c2..7a1c929873cd 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -215,7 +215,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton)
SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) );
if ( aDlgOpt.Exists() )
{
- m_pAddField->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) );
+ m_pAddField->SetWindowState(::rtl::OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US));
}
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index e1d90733c480..84e9a8a6d1a0 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -148,7 +148,7 @@ void SfxModalDialog::GetDialogData_Impl()
if ( aDlgOpt.Exists() )
{
// load settings
- SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) );
+ SetWindowState( rtl::OUStringToOString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) );
Any aUserItem = aDlgOpt.GetUserItem( USERITEM_NAME );
OUString aTemp;
if ( aUserItem >>= aTemp )
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 57e60136b617..cb1f2d8fa1d8 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -738,7 +738,7 @@ void SfxTabDialog::Start_Impl()
if ( aDlgOpt.Exists() )
{
#if !ENABLE_LAYOUT_SFX_TABDIALOG
- SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) );
+ SetWindowState(rtl::OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US));
#endif /* !ENABLE_LAYOUT_SFX_TABDIALOG */
// initial TabPage from Program/Help/config
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index b92816993740..9a685db6b506 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -114,8 +114,8 @@ class AbstractFldInputDlg : public VclAbstractDialog //add for SwFldInputDlg
{
public:
//from class SalFrame
- virtual void SetWindowState( const ByteString& rStr ) = 0;
- virtual ByteString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0;
+ virtual void SetWindowState( const rtl::OString & rStr ) = 0;
+ virtual rtl::OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0;
};
class AbstractInsFootNoteDlg : public VclAbstractDialog //add for SwInsFootNoteDlg
@@ -256,8 +256,8 @@ public:
class AbstractDropDownFieldDialog : public VclAbstractDialog //add for DropDownFieldDialog
{
public:
- virtual ByteString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; //this method inherit from SystemWindow
- virtual void SetWindowState( const ByteString& rStr ) =0;//this method inherit from SystemWindow
+ virtual rtl::OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; //this method inherit from SystemWindow
+ virtual void SetWindowState( const rtl::OString & rStr ) =0;//this method inherit from SystemWindow
};
class AbstractSwLabDlg : public SfxAbstractTabDialog //add for SwLabDlg
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index ca036da3a048..2b1ee116b6fb 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -57,7 +57,6 @@ namespace utl{
class Size;
class ResMgr;
class UniString;
-class ByteString;
class SwPathFinder;
class Graphic;
class OutputDevice;
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index e9b21008762d..8c352243fdd3 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1775,7 +1775,7 @@ SwTestTabPage::SwTestTabPage( Window* pParent,
lcl_SetPosSize(aTest9CBox , Point(116, 53), Size(74 , 10));
lcl_SetPosSize(aTest10CBox , Point(116, 66), Size(74 , 10));
- aTestFL.SetText( String(ByteString("Einstellungen nur f\xFCr Testzwecke" ), RTL_TEXTENCODING_MS_1252));
+ aTestFL.SetText(rtl::OUString(RTL_CONSTASCII_STRINGPARAM("Settings only for testpurposes", RTL_TEXTENCODING_ASCII_US));
aTest1CBox .SetText( C2S("unused"));
aTest2CBox .SetText( C2S("dynamic"));
aTest3CBox .SetText( C2S("No calm" ));
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index e059ab1114f6..4dc1204d6119 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1179,7 +1179,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
catch (const Exception& rExcept)
{
#if OSL_DEBUG_LEVEL > 1
- OSL_FAIL(ByteString(String(rExcept.Message), gsl_getSystemTextEncoding()).GetBuffer());
+ OSL_FAIL(rtl::OUStringToOString(rExcept.Message, osl_getThreadTextEncoding()).getStr());
#else
(void)rExcept;
#endif
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 1b5f9adc1dfe..03b5b0c3978a 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -244,12 +244,12 @@ void AbstractSwInsertDBColAutoPilot_Impl::DataToDoc( const uno::Sequence< uno::A
pDlg->DataToDoc(rSelection, rxSource, xConnection, xResultSet);
}
-ByteString AbstractDropDownFieldDialog_Impl::GetWindowState( sal_uLong nMask ) const
+rtl::OString AbstractDropDownFieldDialog_Impl::GetWindowState( sal_uLong nMask ) const
{
return pDlg->GetWindowState(nMask);
}
-void AbstractDropDownFieldDialog_Impl::SetWindowState( const ByteString& rStr )
+void AbstractDropDownFieldDialog_Impl::SetWindowState( const rtl::OString& rStr )
{
pDlg->SetWindowState(rStr);
}
@@ -400,12 +400,12 @@ String AbstractGlossaryDlg_Impl::GetCurrShortName() const
return pDlg->GetCurrShortName();
}
-void AbstractFldInputDlg_Impl::SetWindowState( const ByteString& rStr )
+void AbstractFldInputDlg_Impl::SetWindowState( const rtl::OString& rStr )
{
pDlg->SetWindowState( rStr );
}
-ByteString AbstractFldInputDlg_Impl::GetWindowState( sal_uLong nMask ) const
+rtl::OString AbstractFldInputDlg_Impl::GetWindowState( sal_uLong nMask ) const
{
return pDlg->GetWindowState( nMask );
}
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index e13ccfd7e84e..b4ee0910b7e8 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -175,8 +175,8 @@ class AbstractSwInsertDBColAutoPilot_Impl : public AbstractSwInsertDBColAutoPil
class AbstractDropDownFieldDialog_Impl : public AbstractDropDownFieldDialog //add for DropDownFieldDialog
{
DECL_ABSTDLG_BASE(AbstractDropDownFieldDialog_Impl, sw::DropDownFieldDialog)
- virtual ByteString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const; //this method inherit from SystemWindow
- virtual void SetWindowState( const ByteString& rStr );//this method inherit from SystemWindow
+ virtual rtl::OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const; //this method inherit from SystemWindow
+ virtual void SetWindowState( const rtl::OString& rStr );//this method inherit from SystemWindow
};
//add for DropDownFieldDialog end
@@ -269,8 +269,8 @@ class AbstractFldInputDlg_Impl : public AbstractFldInputDlg
{
DECL_ABSTDLG_BASE(AbstractFldInputDlg_Impl,SwFldInputDlg)
//from class SalFrame
- virtual void SetWindowState( const ByteString& rStr ) ;
- virtual ByteString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const ;
+ virtual void SetWindowState( const rtl::OString & rStr ) ;
+ virtual rtl::OString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const ;
};
//for SwFldInputDlg end
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 3a71ca85ef84..9d6c0a97d5e0 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -400,9 +400,9 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)();
void MoveCrsr( sal_Bool bWithSelect = sal_False );
// update input fields
- sal_Bool StartInputFldDlg(SwField*, sal_Bool bNextButton, Window* pParentWin = 0, ByteString* pWindowState = 0);
+ sal_Bool StartInputFldDlg(SwField*, sal_Bool bNextButton, Window* pParentWin = 0, rtl::OString* pWindowState = 0);
// update DropDown fields
- sal_Bool StartDropDownFldDlg(SwField*, sal_Bool bNextButton, ByteString* pWindowState = 0);
+ sal_Bool StartDropDownFldDlg(SwField*, sal_Bool bNextButton, rtl::OString* pWindowState = 0);
//"Handler" for changes at DrawView - for controls.
virtual void DrawSelChanged( );
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index 4ffc8f7af846..b5c595b31d5e 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -463,7 +463,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
sPropName += String::CreateFromInt32( i );
lcl_SetProp(xInfo,
xIdxProps,
- ByteString(sPropName, RTL_TEXTENCODING_ASCII_US).GetBuffer(),
+ rtl::OUStringToOString(sPropName, RTL_TEXTENCODING_ASCII_US).getStr(),
pForm->GetTemplate(i + nOffset));
}
}
diff --git a/sw/source/ui/wrtsh/wrtsh2.cxx b/sw/source/ui/wrtsh/wrtsh2.cxx
index 172500cd3fd0..9d3118277cb4 100644
--- a/sw/source/ui/wrtsh/wrtsh2.cxx
+++ b/sw/source/ui/wrtsh/wrtsh2.cxx
@@ -119,7 +119,7 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst, sal_Bool bOnlyInSel )
pTmp->PushCrsr();
sal_Bool bCancel = sal_False;
- ByteString aDlgPos;
+ rtl::OString aDlgPos;
for( sal_uInt16 i = 0; i < nCnt && !bCancel; ++i )
{
pTmp->GotoFieldPos( i );
@@ -147,7 +147,7 @@ void SwWrtShell::UpdateInputFlds( SwInputFieldList* pLst, sal_Bool bOnlyInSel )
sal_Bool SwWrtShell::StartInputFldDlg( SwField* pFld, sal_Bool bNextButton,
- Window* pParentWin, ByteString* pWindowState )
+ Window* pParentWin, rtl::OString* pWindowState )
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -155,7 +155,7 @@ sal_Bool SwWrtShell::StartInputFldDlg( SwField* pFld, sal_Bool bNextButton,
AbstractFldInputDlg* pDlg = pFact->CreateFldInputDlg( DLG_FLD_INPUT,
pParentWin, *this, pFld, bNextButton);
OSL_ENSURE(pDlg, "Dialogdiet fail!");
- if(pWindowState && pWindowState->Len())
+ if(pWindowState && pWindowState->getLength())
pDlg->SetWindowState(*pWindowState);
sal_Bool bRet = RET_CANCEL == pDlg->Execute();
if(pWindowState)
@@ -166,14 +166,14 @@ sal_Bool SwWrtShell::StartInputFldDlg( SwField* pFld, sal_Bool bNextButton,
return bRet;
}
-sal_Bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, sal_Bool bNextButton, ByteString* pWindowState)
+sal_Bool SwWrtShell::StartDropDownFldDlg(SwField* pFld, sal_Bool bNextButton, rtl::OString* pWindowState)
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
AbstractDropDownFieldDialog* pDlg = pFact->CreateDropDownFieldDialog( NULL, *this, pFld, DLG_FLD_DROPDOWN ,bNextButton );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
- if(pWindowState && pWindowState->Len())
+ if(pWindowState && pWindowState->getLength())
pDlg->SetWindowState(*pWindowState);
sal_uInt16 nRet = pDlg->Execute();
if(pWindowState)
generated by cgit (git 2.34.1) at 2025-01-16 18:17:11 +0000