summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compilerplugins/clang/unuseddefaultparams.cxx2
-rw-r--r--include/oox/core/fastparser.hxx2
-rw-r--r--include/oox/helper/binaryinputstream.hxx4
-rw-r--r--include/oox/helper/binaryoutputstream.hxx4
-rw-r--r--oox/inc/drawingml/textcharacterproperties.hxx3
-rw-r--r--oox/source/core/fastparser.cxx4
-rw-r--r--oox/source/drawingml/textcharacterproperties.cxx22
-rw-r--r--oox/source/helper/binaryinputstream.cxx27
-rw-r--r--oox/source/helper/binaryoutputstream.cxx10
-rw-r--r--reportdesign/source/ui/inc/ScrollHelper.hxx6
-rw-r--r--reportdesign/source/ui/report/ScrollHelper.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsClipboard.cxx6
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx4
13 files changed, 42 insertions, 56 deletions
diff --git a/compilerplugins/clang/unuseddefaultparams.cxx b/compilerplugins/clang/unuseddefaultparams.cxx
index 8074e519f4fd..e8b99d37e679 100644
--- a/compilerplugins/clang/unuseddefaultparams.cxx
+++ b/compilerplugins/clang/unuseddefaultparams.cxx
@@ -240,7 +240,7 @@ bool UnusedDefaultParams::VisitDeclRefExpr( const DeclRefExpr* declRefExpr )
return true;
}
-loplugin::Plugin::Registration< UnusedDefaultParams > X("unuseddefaultparams", true);
+loplugin::Plugin::Registration< UnusedDefaultParams > X("unuseddefaultparams", false);
}
diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx
index 946e6541dbb6..b1e42947e7ae 100644
--- a/include/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
@@ -66,7 +66,7 @@ public:
@param bCloseStream True = closes the passed stream after parsing. */
void parseStream(
const css::uno::Reference< css::io::XInputStream >& rxInStream,
- const OUString& rStreamName, bool bCloseStream = false )
+ const OUString& rStreamName )
throw( css::xml::sax::SAXException, css::io::IOException, css::uno::RuntimeException );
/** Parses a stream from the passed storage with the specified name.
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index 101f1f0ad580..4655b8ab250f 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -186,9 +186,9 @@ public:
*/
OUString readCompressedUnicodeArray( sal_Int32 nChars, bool bCompressed, bool bAllowNulChars = false );
- /** Copies nBytes bytes from the current position to the passed output stream.
+ /** Copies bytes from the current position to the passed output stream.
*/
- void copyToStream( BinaryOutputStream& rOutStrm, sal_Int64 nBytes = SAL_MAX_INT64 );
+ void copyToStream( BinaryOutputStream& rOutStrm );
protected:
/** This dummy default c'tor will never call the c'tor of the virtual base
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index 8e315fadaa30..358e72c20515 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -75,9 +75,9 @@ public:
void writeCompressedUnicodeArray( const OUString& rString, bool bCompressed );
- void writeCharArrayUC( const OUString& rString, rtl_TextEncoding eTextEnc, bool bAllowNulChars = false );
+ void writeCharArrayUC( const OUString& rString, rtl_TextEncoding eTextEnc );
- void writeUnicodeArray( const OUString& rString, bool bAllowNulChars = false );
+ void writeUnicodeArray( const OUString& rString );
protected:
/** This dummy default c'tor will never call the c'tor of the virtual base
diff --git a/oox/inc/drawingml/textcharacterproperties.hxx b/oox/inc/drawingml/textcharacterproperties.hxx
index 8f84e8ab0f99..6d7229a6a461 100644
--- a/oox/inc/drawingml/textcharacterproperties.hxx
+++ b/oox/inc/drawingml/textcharacterproperties.hxx
@@ -71,8 +71,7 @@ struct TextCharacterProperties
/** Writes the properties to the passed property map. */
void pushToPropMap(
PropertyMap& rPropMap,
- const ::oox::core::XmlFilterBase& rFilter,
- bool bUseOptional = false ) const;
+ const ::oox::core::XmlFilterBase& rFilter ) const;
/** Writes the properties to the passed property set. */
void pushToPropSet(
diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx
index 6410a42901b6..5a9121d2820d 100644
--- a/oox/source/core/fastparser.cxx
+++ b/oox/source/core/fastparser.cxx
@@ -118,12 +118,12 @@ void FastParser::parseStream( const InputSource& rInputSource, bool bCloseStream
mxParser->parseStream( rInputSource );
}
-void FastParser::parseStream( const Reference< XInputStream >& rxInStream, const OUString& rStreamName, bool bCloseStream ) throw( SAXException, IOException, RuntimeException )
+void FastParser::parseStream( const Reference< XInputStream >& rxInStream, const OUString& rStreamName ) throw( SAXException, IOException, RuntimeException )
{
InputSource aInputSource;
aInputSource.sSystemId = rStreamName;
aInputSource.aInputStream = rxInStream;
- parseStream( aInputSource, bCloseStream );
+ parseStream( aInputSource );
}
void FastParser::parseStream( StorageBase& rStorage, const OUString& rStreamName ) throw( SAXException, IOException, RuntimeException )
diff --git a/oox/source/drawingml/textcharacterproperties.cxx b/oox/source/drawingml/textcharacterproperties.cxx
index acf337ee1a8b..3d71c2db5824 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -66,7 +66,7 @@ void TextCharacterProperties::assignUsed( const TextCharacterProperties& rSource
maGradientProps.assignUsed( rSourceProps.maGradientProps );
}
-void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFilterBase& rFilter, bool bUseOptional ) const
+void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFilterBase& rFilter ) const
{
OUString aFontName;
sal_Int16 nFontPitch = 0;
@@ -140,19 +140,15 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& rPropMap, const XmlFil
rPropMap.setProperty( PROP_CharEscapementHeight, sal_Int8(100)); // 100%
}
- if( !bUseOptional || moBold.has() ) {
- float fWeight = moBold.get( false ) ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL;
- rPropMap.setProperty( PROP_CharWeight, fWeight);
- rPropMap.setProperty( PROP_CharWeightAsian, fWeight);
- rPropMap.setProperty( PROP_CharWeightComplex, fWeight);
- }
+ float fWeight = moBold.get( false ) ? awt::FontWeight::BOLD : awt::FontWeight::NORMAL;
+ rPropMap.setProperty( PROP_CharWeight, fWeight);
+ rPropMap.setProperty( PROP_CharWeightAsian, fWeight);
+ rPropMap.setProperty( PROP_CharWeightComplex, fWeight);
- if( !bUseOptional || moItalic.has() ) {
- awt::FontSlant eSlant = moItalic.get( false ) ? awt::FontSlant_ITALIC : awt::FontSlant_NONE;
- rPropMap.setProperty( PROP_CharPosture, eSlant);
- rPropMap.setProperty( PROP_CharPostureAsian, eSlant);
- rPropMap.setProperty( PROP_CharPostureComplex, eSlant);
- }
+ awt::FontSlant eSlant = moItalic.get( false ) ? awt::FontSlant_ITALIC : awt::FontSlant_NONE;
+ rPropMap.setProperty( PROP_CharPosture, eSlant);
+ rPropMap.setProperty( PROP_CharPostureAsian, eSlant);
+ rPropMap.setProperty( PROP_CharPostureComplex, eSlant);
bool bUnderlineFillFollowText = moUnderlineFillFollowText.get( false );
if( moUnderline.has() && maUnderlineColor.isUsed() && !bUnderlineFillFollowText )
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx
index 7f35f6d3e280..5b5eb5b2d01c 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -102,23 +102,20 @@ OUString BinaryInputStream::readCompressedUnicodeArray( sal_Int32 nChars, bool b
readUnicodeArray( nChars, bAllowNulChars );
}
-void BinaryInputStream::copyToStream( BinaryOutputStream& rOutStrm, sal_Int64 nBytes )
+void BinaryInputStream::copyToStream( BinaryOutputStream& rOutStrm )
{
- if( nBytes > 0 )
+ sal_Int64 nBytes = SAL_MAX_INT64;
+ sal_Int32 nBufferSize = INPUTSTREAM_BUFFERSIZE;
+ StreamDataSequence aBuffer( nBufferSize );
+ while( nBytes > 0 )
{
- // make buffer size a multiple of the passed atom size
- sal_Int32 nBufferSize = getLimitedValue< sal_Int32, sal_Int64 >( nBytes, 0, INPUTSTREAM_BUFFERSIZE );
- StreamDataSequence aBuffer( nBufferSize );
- while( nBytes > 0 )
- {
- sal_Int32 nReadSize = getLimitedValue< sal_Int32, sal_Int64 >( nBytes, 0, nBufferSize );
- sal_Int32 nBytesRead = readData( aBuffer, nReadSize );
- rOutStrm.writeData( aBuffer );
- if( nReadSize == nBytesRead )
- nBytes -= nReadSize;
- else
- nBytes = 0;
- }
+ sal_Int32 nReadSize = getLimitedValue< sal_Int32, sal_Int64 >( nBytes, 0, nBufferSize );
+ sal_Int32 nBytesRead = readData( aBuffer, nReadSize );
+ rOutStrm.writeData( aBuffer );
+ if( nReadSize == nBytesRead )
+ nBytes -= nReadSize;
+ else
+ nBytes = 0;
}
}
diff --git a/oox/source/helper/binaryoutputstream.cxx b/oox/source/helper/binaryoutputstream.cxx
index c35f15bc1834..c6d0f50f6749 100644
--- a/oox/source/helper/binaryoutputstream.cxx
+++ b/oox/source/helper/binaryoutputstream.cxx
@@ -99,20 +99,18 @@ void BinaryXOutputStream::writeMemory( const void* pMem, sal_Int32 nBytes, size_
}
void
-BinaryOutputStream::writeCharArrayUC( const OUString& rString, rtl_TextEncoding eTextEnc, bool bAllowNulChars )
+BinaryOutputStream::writeCharArrayUC( const OUString& rString, rtl_TextEncoding eTextEnc )
{
OString sBuf( OUStringToOString( rString, eTextEnc ) );
- if( !bAllowNulChars )
- sBuf = sBuf.replace( '\0', '?' );
+ sBuf = sBuf.replace( '\0', '?' );
writeMemory( static_cast< const void* >( sBuf.getStr() ), sBuf.getLength() );
}
void
-BinaryOutputStream::writeUnicodeArray( const OUString& rString, bool bAllowNulChars )
+BinaryOutputStream::writeUnicodeArray( const OUString& rString )
{
OUString sBuf( rString );
- if( !bAllowNulChars )
- sBuf = sBuf.replace( '\0', '?' );
+ sBuf = sBuf.replace( '\0', '?' );
#ifdef OSL_BIGENDIAN
// need a non-const buffer for swapping byte order
sal_Unicode notConst[sBuf.getLength()];
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 38f8777e308e..809cdd54860a 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -190,12 +190,8 @@ namespace rptui
void collapseSections(const css::uno::Sequence< css::beans::PropertyValue>& _aCollpasedSections);
/** align all marked objects in all sections
- *
- * \param eHor
- * \param eVert
- * \param bBoundRects
*/
- void alignMarkedObjects(sal_Int32 _nControlModification, bool _bAlignAtSection, bool bBoundRects = false);
+ void alignMarkedObjects(sal_Int32 _nControlModification, bool _bAlignAtSection);
sal_uInt32 getMarkedObjectCount() const;
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index b91cf7e40d09..169207377eb7 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -347,9 +347,9 @@ bool OScrollWindowHelper::Notify( NotifyEvent& rNEvt )
return OScrollWindowHelper_BASE::Notify(rNEvt);
}
-void OScrollWindowHelper::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool bBoundRects)
+void OScrollWindowHelper::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection)
{
- m_aReportWindow->alignMarkedObjects(_nControlModification, _bAlignAtSection, bBoundRects);
+ m_aReportWindow->alignMarkedObjects(_nControlModification, _bAlignAtSection);
}
void OScrollWindowHelper::ImplInitSettings()
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 3d0cf86eda48..7df784fbc729 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -225,7 +225,7 @@ void Clipboard::DoCut ()
}
}
-void Clipboard::DoDelete (vcl::Window* )
+void Clipboard::DoDelete()
{
if (mrSlideSorter.GetModel().GetPageCount() > 1)
{
@@ -233,9 +233,9 @@ void Clipboard::DoDelete (vcl::Window* )
}
}
-void Clipboard::DoCopy (vcl::Window* pWindow )
+void Clipboard::DoCopy ()
{
- CreateSlideTransferable( pWindow, false );
+ CreateSlideTransferable( nullptr, false );
}
void Clipboard::DoPaste ()
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index 8e3cb0456cf6..53217e2a0325 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -74,10 +74,10 @@ public:
void DoCut ();
// Exported for unit test
- SD_DLLPUBLIC void DoCopy(vcl::Window* pWindow = nullptr);
+ SD_DLLPUBLIC void DoCopy();
// Exported for unit test
SD_DLLPUBLIC void DoPaste();
- void DoDelete (vcl::Window* pWindow = nullptr);
+ void DoDelete ();
void StartDrag (
const Point& rDragPt,
generated by cgit (git 2.34.1) at 2024-07-04 01:00:06 +0000