summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sd/source/filter/html/htmlex.cxx3
-rw-r--r--sd/source/filter/html/pubdlg.cxx44
-rw-r--r--sd/source/filter/sdpptwrp.cxx2
-rw-r--r--sd/source/filter/xml/sdxmlwrp.cxx4
4 files changed, 25 insertions, 28 deletions
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index d94a7619f560..356a56d8ba29 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -2790,7 +2790,8 @@ OUString HtmlExport::StringToHTMLString( const OUString& rString )
SvMemoryStream aMemStm;
HTMLOutFuncs::Out_String( aMemStm, rString, RTL_TEXTENCODING_UTF8 );
aMemStm << (char) 0;
- return String( (char*)aMemStm.GetData(), RTL_TEXTENCODING_UTF8 );
+ sal_Int32 nLength = strlen((char*)aMemStm.GetData());
+ return OUString( (char*)aMemStm.GetData(), nLength, RTL_TEXTENCODING_UTF8 );
}
// =====================================================================
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index b6a80505d77f..26acda2af336 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -83,14 +83,14 @@ const char* aPageHelpIds[NOOFPAGES] =
class SdPublishingDesign
{
public:
- String m_aDesignName;
+ OUString m_aDesignName;
HtmlPublishMode m_eMode;
// special WebCast options
PublishingScript m_eScript;
- String m_aCGI;
- String m_aURL;
+ OUString m_aCGI;
+ OUString m_aURL;
// special Kiosk options
sal_Bool m_bAutoSlide;
@@ -103,16 +103,16 @@ public:
// misc options
sal_uInt16 m_nResolution;
- String m_aCompression;
+ OUString m_aCompression;
PublishingFormat m_eFormat;
sal_Bool m_bSlideSound;
sal_Bool m_bHiddenSlides;
// titel page information
- String m_aAuthor;
- String m_aEMail;
- String m_aWWW;
- String m_aMisc;
+ OUString m_aAuthor;
+ OUString m_aEMail;
+ OUString m_aWWW;
+ OUString m_aMisc;
sal_Bool m_bDownload;
sal_Bool m_bCreated; // not used
@@ -143,19 +143,17 @@ SdPublishingDesign::SdPublishingDesign()
m_eFormat = FORMAT_PNG;
- String aFilterConfigPath( "Office.Common/Filter/Graphic/Export/JPG" );
- FilterConfigItem aFilterConfigItem( aFilterConfigPath );
+ FilterConfigItem aFilterConfigItem("Office.Common/Filter/Graphic/Export/JPG");
sal_Int32 nCompression = aFilterConfigItem.ReadInt32( OUString( KEY_QUALITY ), 75 );
- m_aCompression = OUString::number( nCompression );
- m_aCompression.Append( sal_Unicode('%') );
+ m_aCompression = OUString::number(nCompression) + "%";
SvtUserOptions aUserOptions;
m_nResolution = PUB_LOWRES_WIDTH;
m_aAuthor = aUserOptions.GetFirstName();
- if( m_aAuthor.Len() && !aUserOptions.GetLastName().isEmpty() )
- m_aAuthor += sal_Unicode(' ');
- m_aAuthor += (String)aUserOptions.GetLastName();
+ if (!m_aAuthor.isEmpty() && !aUserOptions.GetLastName().isEmpty())
+ m_aAuthor += " ";
+ m_aAuthor += aUserOptions.GetLastName();
m_aEMail = aUserOptions.GetEmail();
m_bDownload = sal_False;
m_nButtonThema = -1;
@@ -357,9 +355,9 @@ private:
CancelButton m_aBtnCancel;
public:
- SdDesignNameDlg(Window* pWindow, const String& aName );
+ SdDesignNameDlg(Window* pWindow, const OUString& aName );
- String GetDesignName();
+ OUString GetDesignName();
DECL_LINK(ModifyHdl, void *);
};
@@ -411,9 +409,7 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType)
pPage2_ASP->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl));
pPage2_PERL->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl));
- String aText( OUString("index") );
- aText += SD_RESSTR(STR_HTMLEXP_DEFAULT_EXTENSION);
- pPage2_Index->SetText(aText);
+ pPage2_Index->SetText("index" + SD_RESSTR(STR_HTMLEXP_DEFAULT_EXTENSION));
pPage2_CGI->SetText( OUString( "/cgi-bin/" ) );
pPage3_Png->SetClickHdl(LINK(this,SdPublishingDlg, GfxFormatHdl));
@@ -1120,7 +1116,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, FinishHdl)
if(bSave)
{
- String aName;
+ OUString aName;
if(m_pDesign)
aName = m_pDesign->m_aDesignName;
@@ -1585,7 +1581,7 @@ sal_Bool SdPublishingDlg::Save()
}
// SdDesignNameDlg Methods
-SdDesignNameDlg::SdDesignNameDlg(Window* pWindow, const String& aName):
+SdDesignNameDlg::SdDesignNameDlg(Window* pWindow, const OUString& aName):
ModalDialog (pWindow, SdResId( DLG_DESIGNNAME )),
m_aEdit (this, SdResId(EDT_NAME)),
m_aBtnOK (this, SdResId(BTN_SAVE)),
@@ -1594,10 +1590,10 @@ SdDesignNameDlg::SdDesignNameDlg(Window* pWindow, const String& aName):
FreeResource();
m_aEdit.SetModifyHdl(LINK(this, SdDesignNameDlg, ModifyHdl ));
m_aEdit.SetText(aName);
- m_aBtnOK.Enable(aName.Len() != 0);
+ m_aBtnOK.Enable(!aName.isEmpty());
}
-String SdDesignNameDlg::GetDesignName()
+OUString SdDesignNameDlg::GetDesignName()
{
return m_aEdit.GetText();
}
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index f70b12a31764..784bb0bd52a4 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -90,7 +90,7 @@ sal_Bool SdPPTFilter::Import()
/* check if there is a dualstorage, then the
document is propably a PPT95 containing PPT97 */
SvStorageRef xDualStorage;
- String sDualStorage( "PP97_DUALSTORAGE" );
+ OUString sDualStorage( "PP97_DUALSTORAGE" );
if ( pStorage->IsContained( sDualStorage ) )
{
xDualStorage = pStorage->OpenSotStorage( sDualStorage, STREAM_STD_READ );
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index ba216c81bef6..5a3fc8de0659 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -196,7 +196,7 @@ SdXMLFilter::~SdXMLFilter(void)
sal_Int32 ReadThroughComponent(
Reference<io::XInputStream> xInputStream,
Reference<XComponent> xModelComponent,
- const String& rStreamName,
+ const OUString& rStreamName,
Reference<uno::XComponentContext> & rxContext,
const sal_Char* pFilterName,
Sequence<Any> rFilterArguments,
@@ -273,7 +273,7 @@ sal_Int32 ReadThroughComponent(
sErr += ",";
sErr += OUString::number( r.ColumnNumber );
- if( rStreamName.Len() )
+ if (!rStreamName.isEmpty())
{
return *new TwoStringErrorInfo(
(bMustBeSuccessfull ? ERR_FORMAT_FILE_ROWCOL
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 21:33:12 +0000