summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sfx2/frmhtmlw.hxx3
-rw-r--r--include/svtools/htmlout.hxx6
-rw-r--r--include/svx/txencbox.hxx8
-rw-r--r--sc/inc/column.hxx10
-rw-r--r--sc/inc/table.hxx2
-rw-r--r--sc/source/core/data/column3.cxx4
-rw-r--r--sc/source/core/data/document.cxx2
-rw-r--r--sc/source/core/data/table2.cxx4
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx7
-rw-r--r--svtools/source/svhtml/htmlout.cxx26
-rw-r--r--svx/source/dialog/txencbox.cxx11
11 files changed, 35 insertions, 48 deletions
diff --git a/include/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx
index 1011327c204c..10faf52abcc6 100644
--- a/include/sfx2/frmhtmlw.hxx
+++ b/include/sfx2/frmhtmlw.hxx
@@ -53,8 +53,7 @@ public:
OUString *pNonConvertableChars = nullptr );
static void Out_FrameDescriptor(
- SvStream&, const OUString& rBaseURL, const css::uno::Reference < css::beans::XPropertySet >& xSet,
- OUString *pNonConvertableChars = nullptr );
+ SvStream&, const OUString& rBaseURL, const css::uno::Reference < css::beans::XPropertySet >& xSet);
};
inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 8bd34b5f1d2a..04b643c2d951 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -59,8 +59,7 @@ struct HTMLOutFuncs
bool bOutStarBasic,
const char *pDelim,
const char *pIndentArea,
- const char *pIndentMap,
- OUString *pNonConvertableChars = nullptr );
+ const char *pIndentMap );
SVT_DLLPUBLIC static SvStream& FlushToAscii( SvStream& );
SVT_DLLPUBLIC static SvStream& OutScript( SvStream& rStrm,
@@ -70,8 +69,7 @@ struct HTMLOutFuncs
ScriptType eScriptType,
const OUString& rSrc,
const OUString *pSBLibrary,
- const OUString *pSBModule,
- OUString *pNonConvertableChars = nullptr );
+ const OUString *pSBModule );
// the 3rd parameter is an array of HTMLOutEvents which is terminated
// by an entry that consists only of 0s
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index c87f07b2ef41..7795ea81e764 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -36,11 +36,6 @@ public:
/** Fill with all known encodings but exclude those matching one or more
given flags as defined in rtl/tencinfo.h
- <p> If nButIncludeInfoFlags is given, encodings are included even if they
- match nExcludeInfoFlags. Thus it is possible to exclude 16/32-bit
- Unicode with RTL_TEXTENCODING_INFO_UNICODE but to include UTF7 and UTF8
- with RTL_TEXTENCODING_INFO_MIME </p>
-
@param bExcludeImportSubsets
If <TRUE/>, some specific encodings are not listed, as they are a
subset of another encoding. This is the case for
@@ -50,8 +45,7 @@ public:
<TRUE/> whenever the box is used in import dialogs. */
void FillFromTextEncodingTable(
bool bExcludeImportSubsets,
- sal_uInt32 nExcludeInfoFlags = 0,
- sal_uInt32 nButIncludeInfoFlags = 0
+ sal_uInt32 nExcludeInfoFlags = 0
);
/** Fill with all encodings known to the dbtools::OCharsetMap but exclude
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e4b7eb148d9a..9303575a5d9d 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -446,11 +446,11 @@ public:
{ return GetString( GetCellValue( rBlockPos, nRow ), nRow, pContext ); }
double* GetValueCell( SCROW nRow );
// Note that if pShared is set and a value is returned that way, the returned OUString is empty.
- OUString GetInputString( SCROW nRow, const svl::SharedString** pShared = nullptr, bool bForceSystemLocale = false ) const
- { return GetInputString( GetCellValue( nRow ), nRow, pShared, bForceSystemLocale ); }
+ OUString GetInputString( SCROW nRow, bool bForceSystemLocale = false ) const
+ { return GetInputString( GetCellValue( nRow ), nRow, bForceSystemLocale ); }
OUString GetInputString( sc::ColumnBlockConstPosition& rBlockPos, SCROW nRow,
- const svl::SharedString** pShared = nullptr, bool bForceSystemLocale = false ) const
- { return GetInputString( GetCellValue( rBlockPos, nRow ), nRow, pShared, bForceSystemLocale ); }
+ bool bForceSystemLocale = false ) const
+ { return GetInputString( GetCellValue( rBlockPos, nRow ), nRow, bForceSystemLocale ); }
double GetValue( SCROW nRow ) const;
const EditTextObject* GetEditText( SCROW nRow ) const;
void RemoveEditTextCharAttribs( SCROW nRow, const ScPatternAttr& rAttr );
@@ -826,7 +826,7 @@ private:
SCROW FindNextVisibleRow(SCROW nRow, bool bForward) const;
OUString GetString( const ScRefCellValue& cell, SCROW nRow, const ScInterpreterContext* pContext = nullptr ) const;
- OUString GetInputString( const ScRefCellValue& cell, SCROW nRow, const svl::SharedString** pShared = nullptr, bool bForceSystemLocale = false ) const;
+ OUString GetInputString( const ScRefCellValue& cell, SCROW nRow, bool bForceSystemLocale = false ) const;
/**
* Called whenever the state of cell array gets modified i.e. new cell
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 1a0a0e477758..7360b3da6921 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -452,7 +452,7 @@ public:
OUString GetString( SCCOL nCol, SCROW nRow, const ScInterpreterContext* pContext = nullptr ) const;
double* GetValueCell( SCCOL nCol, SCROW nRow );
// Note that if pShared is set and a value is returned that way, the returned OUString is empty.
- OUString GetInputString( SCCOL nCol, SCROW nRow, const svl::SharedString** pShared = nullptr, bool bForceSystemLocale = false ) const;
+ OUString GetInputString( SCCOL nCol, SCROW nRow, bool bForceSystemLocale = false ) const;
double GetValue( SCCOL nCol, SCROW nRow ) const;
const EditTextObject* GetEditText( SCCOL nCol, SCROW nRow ) const;
void RemoveEditTextCharAttribs( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr );
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index e8000bdc9797..786fc2387139 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -3051,10 +3051,10 @@ double* ScColumn::GetValueCell( SCROW nRow )
return &sc::numeric_block::at(*it->data, aPos.second);
}
-OUString ScColumn::GetInputString( const ScRefCellValue& aCell, SCROW nRow, const svl::SharedString** pShared, bool bForceSystemLocale ) const
+OUString ScColumn::GetInputString( const ScRefCellValue& aCell, SCROW nRow, bool bForceSystemLocale ) const
{
sal_uLong nFormat = GetNumberFormat(GetDoc().GetNonThreadedContext(), nRow);
- return ScCellFormat::GetInputString(aCell, nFormat, *(GetDoc().GetFormatTable()), GetDoc(), pShared, false, bForceSystemLocale);
+ return ScCellFormat::GetInputString(aCell, nFormat, *(GetDoc().GetFormatTable()), GetDoc(), nullptr, false, bForceSystemLocale);
}
double ScColumn::GetValue( SCROW nRow ) const
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index a458f4d765e6..cb3cc34c3a48 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3583,7 +3583,7 @@ void ScDocument::DiscardFormulaGroupContext()
OUString ScDocument::GetInputString(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bForceSystemLocale ) const
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
- return maTabs[nTab]->GetInputString( nCol, nRow, nullptr, bForceSystemLocale );
+ return maTabs[nTab]->GetInputString( nCol, nRow, bForceSystemLocale );
else
return OUString();
}
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 3ba4ce9b5bfd..5a684edfcf9e 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1787,10 +1787,10 @@ double* ScTable::GetValueCell( SCCOL nCol, SCROW nRow )
return CreateColumnIfNotExists(nCol).GetValueCell(nRow);
}
-OUString ScTable::GetInputString( SCCOL nCol, SCROW nRow, const svl::SharedString** pShared, bool bForceSystemLocale ) const
+OUString ScTable::GetInputString( SCCOL nCol, SCROW nRow, bool bForceSystemLocale ) const
{
if (ValidColRow(nCol, nRow) && nCol < GetAllocatedColumnsCount())
- return aCol[nCol].GetInputString( nRow, pShared, bForceSystemLocale );
+ return aCol[nCol].GetInputString( nRow, bForceSystemLocale );
else
return OUString();
}
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index d568b193040f..5569ab63996b 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -215,8 +215,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
}
void SfxFrameHTMLWriter::Out_FrameDescriptor(
- SvStream& rOut, const OUString& rBaseURL, const uno::Reference < beans::XPropertySet >& xSet,
- OUString *pNonConvertableChars )
+ SvStream& rOut, const OUString& rBaseURL, const uno::Reference < beans::XPropertySet >& xSet )
{
try
{
@@ -232,7 +231,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
rBaseURL, aURL );
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_src "=\"");
rOut.WriteOString( sOut.makeStringAndClear() );
- HTMLOutFuncs::Out_String( rOut, aURL, pNonConvertableChars );
+ HTMLOutFuncs::Out_String( rOut, aURL );
sOut.append('\"');
}
}
@@ -242,7 +241,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_name "=\"");
rOut.WriteOString( sOut.makeStringAndClear() );
- HTMLOutFuncs::Out_String( rOut, aStr, pNonConvertableChars );
+ HTMLOutFuncs::Out_String( rOut, aStr );
sOut.append('\"');
}
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index b42e425df350..473be3c3fb1c 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -598,8 +598,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
bool bOutStarBasic,
const char *pDelim,
const char *pIndentArea,
- const char *pIndentMap,
- OUString *pNonConvertableChars )
+ const char *pIndentMap )
{
const OUString& rOutName = !rName.isEmpty() ? rName : rIMap.GetName();
DBG_ASSERT( !rOutName.isEmpty(), "No ImageMap-Name" );
@@ -613,7 +612,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
OOO_STRING_SVTOOLS_HTML_O_name
"=\"");
rStream.WriteOString( sOut.makeStringAndClear() );
- Out_String( rStream, rOutName, pNonConvertableChars );
+ Out_String( rStream, rOutName );
rStream.WriteCharPtr( "\">" );
for( size_t i=0; i<rIMap.GetIMapObjectCount(); i++ )
@@ -714,7 +713,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
rBaseURL, aURL );
sOut.append(OOO_STRING_SVTOOLS_HTML_O_href "=\"");
rStream.WriteOString( sOut.makeStringAndClear() );
- Out_String( rStream, aURL, pNonConvertableChars ).WriteChar( '\"' );
+ Out_String( rStream, aURL ).WriteChar( '\"' );
}
else
rStream.WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_nohref );
@@ -724,7 +723,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_name "=\"");
rStream.WriteOString( sOut.makeStringAndClear() );
- Out_String( rStream, rObjName, pNonConvertableChars ).WriteChar( '\"' );
+ Out_String( rStream, rObjName ).WriteChar( '\"' );
}
const OUString& rTarget = pObj->GetTarget();
@@ -732,7 +731,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_target "=\"");
rStream.WriteOString( sOut.makeStringAndClear() );
- Out_String( rStream, rTarget, pNonConvertableChars ).WriteChar( '\"' );
+ Out_String( rStream, rTarget ).WriteChar( '\"' );
}
OUString rDesc( pObj->GetAltText() );
@@ -743,13 +742,13 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_alt "=\"");
rStream.WriteOString( sOut.makeStringAndClear() );
- Out_String( rStream, rDesc, pNonConvertableChars ).WriteChar( '\"' );
+ Out_String( rStream, rDesc ).WriteChar( '\"' );
}
const SvxMacroTableDtor& rMacroTab = pObj->GetMacroTable();
if( pEventTable && !rMacroTab.empty() )
Out_Events( rStream, rMacroTab, pEventTable,
- bOutStarBasic, pNonConvertableChars );
+ bOutStarBasic );
rStream.WriteChar( '>' );
}
@@ -773,8 +772,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
ScriptType eScriptType,
const OUString& rSrc,
const OUString *pSBLibrary,
- const OUString *pSBModule,
- OUString *pNonConvertableChars )
+ const OUString *pSBModule )
{
// script is not indented!
OStringBuffer sOut;
@@ -785,7 +783,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_language "=\"");
rStrm.WriteOString( sOut.makeStringAndClear() );
- Out_String( rStrm, rLanguage, pNonConvertableChars );
+ Out_String( rStrm, rLanguage );
sOut.append('\"');
}
@@ -793,7 +791,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_src "=\"");
rStrm.WriteOString( sOut.makeStringAndClear() );
- Out_String( rStrm, URIHelper::simpleNormalizedMakeRelative(rBaseURL, rSrc), pNonConvertableChars );
+ Out_String( rStrm, URIHelper::simpleNormalizedMakeRelative(rBaseURL, rSrc) );
sOut.append('\"');
}
@@ -801,7 +799,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_sdlibrary "=\"");
rStrm.WriteOString( sOut.makeStringAndClear() );
- Out_String( rStrm, *pSBLibrary, pNonConvertableChars );
+ Out_String( rStrm, *pSBLibrary );
sOut.append('\"');
}
@@ -809,7 +807,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
{
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_sdmodule "=\"");
rStrm.WriteOString( sOut.makeStringAndClear() );
- Out_String( rStrm, *pSBModule, pNonConvertableChars );
+ Out_String( rStrm, *pSBModule );
sOut.append('\"');
}
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 0aff6781dbe0..f6bc5fa72919 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -132,7 +132,7 @@ SvxTextEncodingTreeView::~SvxTextEncodingTreeView()
namespace
{
- std::vector<int> FillFromTextEncodingTable(bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags, sal_uInt32 nButIncludeInfoFlags)
+ std::vector<int> FillFromTextEncodingTable(bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags)
{
std::vector<int> aRet;
@@ -156,7 +156,7 @@ namespace
nEnc == RTL_TEXTENCODING_UCS4) )
bInsert = false; // InfoFlags don't work for Unicode :-(
}
- else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 )
+ else
bInsert = false;
}
}
@@ -180,10 +180,9 @@ namespace
}
void SvxTextEncodingBox::FillFromTextEncodingTable(
- bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
- sal_uInt32 nButIncludeInfoFlags )
+ bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags )
{
- std::vector<int> aRet(::FillFromTextEncodingTable(bExcludeImportSubsets, nExcludeInfoFlags, nButIncludeInfoFlags));
+ std::vector<int> aRet(::FillFromTextEncodingTable(bExcludeImportSubsets, nExcludeInfoFlags));
m_xControl->freeze();
for (auto j : aRet)
{
@@ -196,7 +195,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
void SvxTextEncodingTreeView::FillFromTextEncodingTable(
bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags )
{
- std::vector<int> aRet(::FillFromTextEncodingTable(bExcludeImportSubsets, nExcludeInfoFlags, /*nButIncludeInfoFlags*/0));
+ std::vector<int> aRet(::FillFromTextEncodingTable(bExcludeImportSubsets, nExcludeInfoFlags));
m_xControl->freeze();
for (auto j : aRet)
{
generated by cgit (git 2.34.1) at 2024-08-07 12:15:10 +0000