Skip to content

C
core
Kaydet (Commit) 6a161173 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

loplugin:deletedspecial 

Change-Id: I37eb6c976779aeec829d312920ab1d18884c0f2f
üst e59c048e
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 64 deletions
include/oox/core/binarycodec.hxx
Dosyayı görüntüle @ 6a161173
......@@ -34,16 +34,11 @@ namespace core {
class OOX_DLLPUBLIC CodecHelper
namespace CodecHelper
{
public:
/** Returns the password hash if it is in the required 16-bit limit. */
static sal_uInt16 getPasswordHash( const AttributeList& rAttribs, sal_Int32 nElement );
private:
CodecHelper();
~CodecHelper();
};
OOX_DLLPUBLIC sal_uInt16 getPasswordHash( const AttributeList& rAttribs, sal_Int32 nElement );
}
......
include/oox/core/contexthandler.hxx
Dosyayı görüntüle @ 6a161173
......@@ -102,7 +102,7 @@ protected:
#endif
private:
ContextHandler& operator=( const ContextHandler& );
ContextHandler& operator=( const ContextHandler& ) SAL_DELETED_FUNCTION;
private:
FragmentBaseDataRef mxBaseData; ///< Base data of the fragment.
......
include/oox/core/contexthandler2.hxx
Dosyayı görüntüle @ 6a161173
......@@ -194,7 +194,7 @@ protected:
void implEndRecord( sal_Int32 nRecId );
private:
ContextHandler2Helper& operator=( const ContextHandler2Helper& );
ContextHandler2Helper& operator=( const ContextHandler2Helper& ) SAL_DELETED_FUNCTION;
ElementInfo& pushElementInfo( sal_Int32 nElement );
void popElementInfo();
......
include/oox/drawingml/chart/chartconverter.hxx
Dosyayı görüntüle @ 6a161173
......@@ -89,8 +89,8 @@ public:
const DataSequenceModel& rDataSeq, const OUString& rRole );
private:
ChartConverter( const ChartConverter& );
ChartConverter& operator=( const ChartConverter& );
ChartConverter( const ChartConverter& ) SAL_DELETED_FUNCTION;
ChartConverter& operator=( const ChartConverter& ) SAL_DELETED_FUNCTION;
};
......
include/oox/dump/dumperbase.hxx
Dosyayı görüntüle @ 6a161173
......@@ -1103,8 +1103,8 @@ public:
explicit IndentGuard( const OutputRef& rxOut ) : mrOut( *rxOut ) { mrOut.incIndent(); }
~IndentGuard() { mrOut.decIndent(); }
private:
IndentGuard( const IndentGuard& );
IndentGuard& operator=( const IndentGuard& );
IndentGuard( const IndentGuard& ) SAL_DELETED_FUNCTION;
IndentGuard& operator=( const IndentGuard& ) SAL_DELETED_FUNCTION;
private:
Output& mrOut;
};
......@@ -1127,8 +1127,8 @@ public:
void tab() { mrOut.tab(); }
void tab( size_t nCol ) { mrOut.tab( nCol ); }
private:
TableGuard( const TableGuard& );
TableGuard& operator=( const TableGuard& );
TableGuard( const TableGuard& ) SAL_DELETED_FUNCTION;
TableGuard& operator=( const TableGuard& ) SAL_DELETED_FUNCTION;
private:
Output& mrOut;
};
......@@ -1143,8 +1143,8 @@ public:
~ItemGuard() { mrOut.endItem(); }
void cont() { mrOut.contItem(); }
private:
ItemGuard( const ItemGuard& );
ItemGuard& operator=( const ItemGuard& );
ItemGuard( const ItemGuard& ) SAL_DELETED_FUNCTION;
ItemGuard& operator=( const ItemGuard& ) SAL_DELETED_FUNCTION;
private:
Output& mrOut;
};
......@@ -1157,8 +1157,8 @@ public:
explicit MultiItemsGuard( const OutputRef& rxOut ) : mrOut( *rxOut ) { mrOut.startMultiItems(); }
~MultiItemsGuard() { mrOut.endMultiItems(); }
private:
MultiItemsGuard( const MultiItemsGuard& );
MultiItemsGuard& operator=( const MultiItemsGuard& );
MultiItemsGuard( const MultiItemsGuard& ) SAL_DELETED_FUNCTION;
MultiItemsGuard& operator=( const MultiItemsGuard& ) SAL_DELETED_FUNCTION;
private:
Output& mrOut;
};
......
include/oox/helper/binarystreambase.hxx
Dosyayı görüntüle @ 6a161173
......@@ -111,8 +111,8 @@ protected:
explicit BinaryStreamBase( bool bSeekable ) : mbEof( false ), mbSeekable( bSeekable ) {}
private:
BinaryStreamBase( const BinaryStreamBase& );
BinaryStreamBase& operator=( const BinaryStreamBase& );
BinaryStreamBase( const BinaryStreamBase& ) SAL_DELETED_FUNCTION;
BinaryStreamBase& operator=( const BinaryStreamBase& ) SAL_DELETED_FUNCTION;
protected:
bool mbEof; ///< End of stream flag.
......
include/oox/helper/storagebase.hxx
Dosyayı görüntüle @ 6a161173
......@@ -138,8 +138,8 @@ protected:
explicit StorageBase( const StorageBase& rParentStorage, const OUString& rStorageName, bool bReadOnly );
private:
StorageBase( const StorageBase& );
StorageBase& operator=( const StorageBase& );
StorageBase( const StorageBase& ) SAL_DELETED_FUNCTION;
StorageBase& operator=( const StorageBase& ) SAL_DELETED_FUNCTION;
/** Returns true, if the object represents a valid storage. */
virtual bool implIsStorage() const = 0;
......
include/oox/ole/olehelper.hxx
Dosyayı görüntüle @ 6a161173
......@@ -100,34 +100,33 @@ struct StdHlinkInfo
/** Static helper functions for OLE import/export. */
class OOX_DLLPUBLIC OleHelper
namespace OleHelper
{
public:
/** Returns the UNO RGB color from the passed encoded OLE color.
@param bDefaultColorBgr
True = OLE default color type is treated as BGR color.
False = OLE default color type is treated as palette color.
*/
static sal_Int32 decodeOleColor(
OOX_DLLPUBLIC sal_Int32 decodeOleColor(
const GraphicHelper& rGraphicHelper,
sal_uInt32 nOleColor,
bool bDefaultColorBgr = true );
/** Returns the OLE color from the passed UNO RGB color.
*/
static sal_uInt32 encodeOleColor( sal_Int32 nRgbColor );
OOX_DLLPUBLIC sal_uInt32 encodeOleColor( sal_Int32 nRgbColor );
/** Imports a GUID from the passed binary stream and returns its string
representation (in uppercase characters).
*/
static OUString importGuid( BinaryInputStream& rInStrm );
static void exportGuid( BinaryOutputStream& rOutStrm, const SvGlobalName& rId );
OOX_DLLPUBLIC OUString importGuid( BinaryInputStream& rInStrm );
OOX_DLLPUBLIC void exportGuid( BinaryOutputStream& rOutStrm, const SvGlobalName& rId );
/** Imports an OLE StdFont font structure from the current position of the
passed binary stream.
*/
static bool importStdFont(
OOX_DLLPUBLIC bool importStdFont(
StdFontInfo& orFontInfo,
BinaryInputStream& rInStrm,
bool bWithGuid );
......@@ -135,15 +134,11 @@ public:
/** Imports an OLE StdPic picture from the current position of the passed
binary stream.
*/
static bool importStdPic(
OOX_DLLPUBLIC bool importStdPic(
StreamDataSequence& orGraphicData,
BinaryInputStream& rInStrm,
bool bWithGuid );
private:
OleHelper(); // not implemented
~OleHelper(); // not implemented
};
}
// ideally it would be great to get rid of SvxMSConvertOCXControls
// however msfilter/source/msfilter/svdfppt.cxx still uses
......
include/oox/ole/vbahelper.hxx
Dosyayı görüntüle @ 6a161173
......@@ -52,9 +52,8 @@ const sal_uInt16 VBA_ID_PROJECTVERSION = 0x0009;
/** Static helper functions for the VBA filters. */
class VbaHelper
namespace VbaHelper
{
public:
/** Reads the next record from the VBA directory stream 'dir'.
@param rnRecId (out parameter) The record identifier of the new record.
......@@ -64,7 +63,7 @@ public:
@return True = next record successfully read. False on any error, or
if the stream is EOF.
*/
static bool readDirRecord(
bool readDirRecord(
sal_uInt16& rnRecId,
StreamDataSequence& rRecData,
BinaryInputStream& rInStrm );
......@@ -78,15 +77,11 @@ public:
@return True = Equality sign separator found, and the returned key and
value are not empty. False otherwise.
*/
static bool extractKeyValue(
bool extractKeyValue(
OUString& rKey,
OUString& rValue,
const OUString& rKeyValue );
private:
VbaHelper();
~VbaHelper();
};
}
......
include/oox/ole/vbaproject.hxx
Dosyayı görüntüle @ 6a161173
......@@ -155,8 +155,8 @@ protected:
void finalizeImport();
private:
VbaProject( const VbaProject& );
VbaProject& operator=( const VbaProject& );
VbaProject( const VbaProject& ) SAL_DELETED_FUNCTION;
VbaProject& operator=( const VbaProject& ) SAL_DELETED_FUNCTION;
/** Returns the Basic or dialog library container. */
::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer >
......
include/oox/vml/vmlformatting.hxx
Dosyayı görüntüle @ 6a161173
......@@ -44,19 +44,18 @@ typedef ::std::pair< double, double > DoublePair;
class OOX_DLLPUBLIC ConversionHelper
namespace ConversionHelper
{
public:
/** Returns two values contained in rValue separated by cSep.
*/
static bool separatePair(
OOX_DLLPUBLIC bool separatePair(
OUString& orValue1, OUString& orValue2,
const OUString& rValue, sal_Unicode cSep );
/** Returns the boolean value from the passed string of a VML attribute.
Supported values: 'f', 't', 'false', 'true'. False for anything else.
*/
static bool decodeBool( const OUString& rValue );
OOX_DLLPUBLIC bool decodeBool( const OUString& rValue );
/** Converts the passed VML percentage measure string to a normalized
floating-point value.
......@@ -67,7 +66,7 @@ public:
is present, the value will be divided by 100. If the 'f' sign is present,
the value will be divided by 65536.
*/
static double decodePercent(
OOX_DLLPUBLIC double decodePercent(
const OUString& rValue,
double fDefValue );
......@@ -89,7 +88,7 @@ public:
@param bDefaultAsPixel Set to true if omitted measure unit means
pixel. Set to false if omitted measure unit means EMU.
*/
static sal_Int64 decodeMeasureToEmu(
OOX_DLLPUBLIC sal_Int64 decodeMeasureToEmu(
const GraphicHelper& rGraphicHelper,
const OUString& rValue,
sal_Int32 nRefValue,
......@@ -104,7 +103,7 @@ public:
@param bPixelX See above.
@param bDefaultAsPixel See above.
*/
static sal_Int32 decodeMeasureToHmm(
OOX_DLLPUBLIC sal_Int32 decodeMeasureToHmm(
const GraphicHelper& rGraphicHelper,
const OUString& rValue,
sal_Int32 nRefValue,
......@@ -133,7 +132,7 @@ public:
@return The resulting DrawingML color.
*/
static ::oox::drawingml::Color decodeColor(
OOX_DLLPUBLIC ::oox::drawingml::Color decodeColor(
const GraphicHelper& rGraphicHelper,
const OptValue< OUString >& roVmlColor,
const OptValue< double >& roVmlOpacity,
......@@ -152,15 +151,11 @@ public:
@param rGraphicHelper See above.
*/
static void decodeVmlPath(
OOX_DLLPUBLIC void decodeVmlPath(
::std::vector< ::std::vector< ::com::sun::star::awt::Point > >& rPoints,
::std::vector< ::std::vector< ::com::sun::star::drawing::PolygonFlags > >& rFlags,
const OUString& rPath );
private:
ConversionHelper();
~ConversionHelper();
};
}
......
oox/source/shape/ShapeContextHandler.hxx
Dosyayı görüntüle @ 6a161173
......@@ -139,8 +139,8 @@ public:
virtual void SAL_CALL setPosition(const css::awt::Point& rPosition) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
ShapeContextHandler(ShapeContextHandler &); // not defined
void operator =(ShapeContextHandler &); // not defined
ShapeContextHandler(ShapeContextHandler &) SAL_DELETED_FUNCTION;
void operator =(ShapeContextHandler &) SAL_DELETED_FUNCTION;
::sal_uInt32 mnStartToken;
css::awt::Point maPosition;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment