summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/inc/docsh.hxx32
-rw-r--r--sw/source/ui/app/docsh2.cxx4
-rw-r--r--sw/source/ui/app/docst.cxx26
3 files changed, 29 insertions, 33 deletions
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 25b0808c122c..333d6db26af5 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -107,8 +107,8 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
// Only used for nFamily == SFX_STYLE_FAMILY_PAGE. Identifies optional Slot by which the edit is triggered.
// Used to activate certain dialog pane
SW_DLLPRIVATE sal_uInt16 Edit(
- const String &rName,
- const String& rParent,
+ const OUString &rName,
+ const OUString& rParent,
const sal_uInt16 nFamily,
sal_uInt16 nMask,
const sal_Bool bNew,
@@ -116,14 +116,14 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
SwWrtShell* pActShell = 0,
const sal_Bool bBasic = sal_False );
- SW_DLLPRIVATE sal_uInt16 Delete(const String &rName, sal_uInt16 nFamily);
- SW_DLLPRIVATE sal_uInt16 Hide(const String &rName, sal_uInt16 nFamily, bool bHidden);
- SW_DLLPRIVATE sal_uInt16 ApplyStyles(const String &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0,
- sal_uInt16 nMode = 0 );
- SW_DLLPRIVATE sal_uInt16 DoWaterCan( const String &rName, sal_uInt16 nFamily);
- SW_DLLPRIVATE sal_uInt16 UpdateStyle(const String &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0);
- SW_DLLPRIVATE sal_uInt16 MakeByExample(const String &rName,
- sal_uInt16 nFamily, sal_uInt16 nMask, SwWrtShell* pShell = 0);
+ SW_DLLPRIVATE sal_uInt16 Delete(const OUString &rName, sal_uInt16 nFamily);
+ SW_DLLPRIVATE sal_uInt16 Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden);
+ SW_DLLPRIVATE sal_uInt16 ApplyStyles(const OUString &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0,
+ sal_uInt16 nMode = 0 );
+ SW_DLLPRIVATE sal_uInt16 DoWaterCan( const OUString &rName, sal_uInt16 nFamily);
+ SW_DLLPRIVATE sal_uInt16 UpdateStyle(const OUString &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0);
+ SW_DLLPRIVATE sal_uInt16 MakeByExample(const OUString &rName,
+ sal_uInt16 nFamily, sal_uInt16 nMask, SwWrtShell* pShell = 0);
SW_DLLPRIVATE void InitDraw();
SW_DLLPRIVATE void SubInitNew(); ///< for InitNew and HtmlSourceMode.
@@ -131,7 +131,7 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
SW_DLLPRIVATE void RemoveOLEObjects();
SW_DLLPRIVATE void CalcLayoutForOLEObjects();
- SW_DLLPRIVATE void Init_Impl();
+ SW_DLLPRIVATE void Init_Impl();
SW_DLLPRIVATE DECL_STATIC_LINK( SwDocShell, IsLoadFinished, void* );
@@ -241,7 +241,7 @@ public:
// @param nSlot
// Identifies slot by which the dialog is triggered. Used to activate certain dialog pane
void FormatPage(
- const String& rPage,
+ const OUString& rPage,
const OString& rPageId,
SwWrtShell& rActShell );
@@ -256,7 +256,7 @@ public:
virtual void CancelTransfers();
/// Re-read Doc from Html-source.
- void ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView );
+ void ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcView );
sal_Int16 GetUpdateDocMode() const {return nUpdateDocMode;}
@@ -268,7 +268,7 @@ public:
void ToggleBrowserMode(sal_Bool bOn, SwView* pView);
- sal_uLong LoadStylesFromFile( const String& rURL, SwgReaderOption& rOpt,
+ sal_uLong LoadStylesFromFile( const OUString& rURL, SwgReaderOption& rOpt,
sal_Bool bUnoCall );
void InvalidateModel();
void ReactivateModel();
@@ -302,10 +302,6 @@ public:
virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash );
};
-class Graphic;
- /// implemented in source/ui/docvw/romenu.cxx
-String ExportGraphic( const Graphic &rGraphic, const String &rGrfName );
-
/** Find the right DocShell and create a new one:
The return value specifies what should happen to the Shell
0 - Error, could not find the DocShell
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 6422f0c26a3e..cb3a4474fd74 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -1276,7 +1276,7 @@ class SwReloadFromHtmlReader : public SwReader
}
};
-void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView )
+void SwDocShell::ReloadFromHtml( const OUString& rStreamName, SwSrcView* pSrcView )
{
sal_Bool bModified = IsModified();
@@ -1382,7 +1382,7 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView
pDoc->ResetModified();
}
-sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL,
+sal_uLong SwDocShell::LoadStylesFromFile( const OUString& rURL,
SwgReaderOption& rOpt, sal_Bool bUnoCall )
{
sal_uLong nErr = 0;
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 3900b664d2c7..ea78145fd251 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -593,8 +593,8 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl)
}
sal_uInt16 SwDocShell::Edit(
- const String &rName,
- const String &rParent,
+ const OUString &rName,
+ const OUString &rParent,
const sal_uInt16 nFamily,
sal_uInt16 nMask,
const sal_Bool bNew,
@@ -623,7 +623,7 @@ sal_uInt16 SwDocShell::Edit(
{
case SFX_STYLE_FAMILY_PARA:
{
- if(rParent.Len())
+ if(!rParent.isEmpty())
{
SwTxtFmtColl* pColl = pWrtShell->FindTxtFmtCollByName( rParent );
if(!pColl)
@@ -657,7 +657,7 @@ sal_uInt16 SwDocShell::Edit(
break;
case SFX_STYLE_FAMILY_CHAR:
{
- if(rParent.Len())
+ if(!rParent.isEmpty())
{
SwCharFmt* pCFmt = pWrtShell->FindCharFmtByName( rParent );
if(!pCFmt)
@@ -681,7 +681,7 @@ sal_uInt16 SwDocShell::Edit(
break;
case SFX_STYLE_FAMILY_FRAME :
{
- if(rParent.Len())
+ if(!rParent.isEmpty())
{
SwFrmFmt* pFFmt = pWrtShell->GetDoc()->FindFrmFmtByName( rParent );
if(!pFFmt)
@@ -807,7 +807,7 @@ sal_uInt16 SwDocShell::Edit(
}
// Delete
-sal_uInt16 SwDocShell::Delete(const String &rName, sal_uInt16 nFamily)
+sal_uInt16 SwDocShell::Delete(const OUString &rName, sal_uInt16 nFamily)
{
SfxStyleSheetBase *pStyle = mxBasePool->Find(rName, (SfxStyleFamily)nFamily);
@@ -824,7 +824,7 @@ sal_uInt16 SwDocShell::Delete(const String &rName, sal_uInt16 nFamily)
return sal_False;
}
-sal_uInt16 SwDocShell::Hide(const String &rName, sal_uInt16 nFamily, bool bHidden)
+sal_uInt16 SwDocShell::Hide(const OUString &rName, sal_uInt16 nFamily, bool bHidden)
{
SfxStyleSheetBase *pStyle = mxBasePool->Find(rName, (SfxStyleFamily)nFamily);
@@ -843,7 +843,7 @@ sal_uInt16 SwDocShell::Hide(const String &rName, sal_uInt16 nFamily, bool bHidde
}
// apply template
-sal_uInt16 SwDocShell::ApplyStyles(const String &rName, sal_uInt16 nFamily,
+sal_uInt16 SwDocShell::ApplyStyles(const OUString &rName, sal_uInt16 nFamily,
SwWrtShell* pShell, sal_uInt16 nMode )
{
SwDocStyleSheet* pStyle =
@@ -906,7 +906,7 @@ sal_uInt16 SwDocShell::ApplyStyles(const String &rName, sal_uInt16 nFamily,
}
// start watering-can
-sal_uInt16 SwDocShell::DoWaterCan(const String &rName, sal_uInt16 nFamily)
+sal_uInt16 SwDocShell::DoWaterCan(const OUString &rName, sal_uInt16 nFamily)
{
assert( GetWrtShell() );
@@ -914,7 +914,7 @@ sal_uInt16 SwDocShell::DoWaterCan(const String &rName, sal_uInt16 nFamily)
SwApplyTemplate* pApply = rEdtWin.GetApplyTemplate();
bool bWaterCan = !(pApply && pApply->eType != 0);
- if( !rName.Len() )
+ if( rName.isEmpty() )
bWaterCan = false;
SwApplyTemplate aTemplate;
@@ -960,7 +960,7 @@ sal_uInt16 SwDocShell::DoWaterCan(const String &rName, sal_uInt16 nFamily)
}
// update template
-sal_uInt16 SwDocShell::UpdateStyle(const String &rName, sal_uInt16 nFamily, SwWrtShell* pShell)
+sal_uInt16 SwDocShell::UpdateStyle(const OUString &rName, sal_uInt16 nFamily, SwWrtShell* pShell)
{
SwWrtShell* pCurrWrtShell = pShell ? pShell : GetWrtShell();
assert( pCurrWrtShell );
@@ -1045,7 +1045,7 @@ sal_uInt16 SwDocShell::UpdateStyle(const String &rName, sal_uInt16 nFamily, SwWr
}
// NewByExample
-sal_uInt16 SwDocShell::MakeByExample( const String &rName, sal_uInt16 nFamily,
+sal_uInt16 SwDocShell::MakeByExample( const OUString &rName, sal_uInt16 nFamily,
sal_uInt16 nMask, SwWrtShell* pShell )
{
SwWrtShell* pCurrWrtShell = pShell ? pShell : GetWrtShell();
@@ -1245,7 +1245,7 @@ void SwDocShell::_LoadStyles( SfxObjectShell& rSource, sal_Bool bPreserveCurrent
}
void SwDocShell::FormatPage(
- const String& rPage,
+ const OUString& rPage,
const OString& rPageId,
SwWrtShell& rActShell )
{
generated by cgit (git 2.34.1) at 2024-06-26 14:57:58 +0000