summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/canvas/verifyinput.hxx21
-rw-r--r--include/oox/ole/axcontrol.hxx4
-rw-r--r--include/oox/ppt/timenodelistcontext.hxx2
-rw-r--r--include/svtools/brwbox.hxx1
-rw-r--r--include/svtools/htmlout.hxx6
-rw-r--r--include/svx/ruler.hxx3
-rw-r--r--include/svx/svdobj.hxx3
-rw-r--r--include/svx/xit.hxx2
-rw-r--r--include/vbahelper/vbaeventshelperbase.hxx3
-rw-r--r--include/vbahelper/vbahelper.hxx3
10 files changed, 8 insertions, 40 deletions
diff --git a/include/canvas/verifyinput.hxx b/include/canvas/verifyinput.hxx
index 067083d436af..ac9d4e840748 100644
--- a/include/canvas/verifyinput.hxx
+++ b/include/canvas/verifyinput.hxx
@@ -288,27 +288,6 @@ namespace canvas
const css::uno::Reference< css::uno::XInterface >& xIf,
::sal_Int16 nArgPos );
- /** Basic check for font info validity.
-
- @param fontInfo
- Font info to check
-
- @param xIf
- The interface that should be reported as the one
- generating the exception.
-
- @param nArgPos
- Argument position on the call site (i.e. the position of
- the argument, checked here, on the UNO interface
- method. Counting starts at 0).
-
- @throws an lang::IllegalArgumentException, if anything is wrong
- */
- CANVASTOOLS_DLLPUBLIC void verifyInput( const css::rendering::FontInfo& fontInfo,
- const char* pStr,
- const css::uno::Reference< css::uno::XInterface >& xIf,
- ::sal_Int16 nArgPos );
-
/** Basic check for font request validity.
@param fontRequest
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 59e56dc3cedd..6da2e8039ffc 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -322,8 +322,7 @@ public:
PropertySet const & rPropSet,
OUString& rValue,
sal_Int32& nMultiSelect,
- ApiDefaultStateMode eDefStateMode,
- bool bAwtModel );
+ ApiDefaultStateMode eDefStateMode );
/** Converts the Forms 2.0 control orientation to UNO properties. */
static void convertAxOrientation(
@@ -333,7 +332,6 @@ public:
static void convertToAxOrientation(
PropertySet const & rPropSet,
- const AxPairData& rSize,
sal_Int32& nOrientation );
private:
diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx
index e592cc289f33..c93ee8a4880f 100644
--- a/include/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
@@ -43,7 +43,7 @@ namespace oox { namespace ppt {
static TimeNodeContext * SAL_CALL makeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
protected:
- TimeNodeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw();
+ TimeNodeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32 aElement, const TimeNodePtr & pNode ) throw();
sal_Int32 mnElement;
TimeNodePtr mpNode;
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 53ca0cc2cbb8..0b089a7235b0 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -417,7 +417,6 @@ public:
virtual void CursorMoved();
virtual void ColumnMoved( sal_uInt16 nColId );
virtual void ColumnResized( sal_uInt16 nColId );
- static long QueryColumnResize( sal_uInt16 nColId, long nWidth );
/// called when the row height has been changed interactively
virtual void RowHeightChanged();
virtual long QueryMinimumRowHeight();
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 5d14ef72b845..d58080e8e443 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -58,16 +58,14 @@ struct HTMLOutFuncs
OUString *pNonConvertableChars );
SVT_DLLPUBLIC static SvStream& Out_AsciiTag( SvStream&, const sal_Char* pStr,
- bool bOn = true,
- rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252);
+ bool bOn = true);
SVT_DLLPUBLIC static SvStream& Out_Char( SvStream&, sal_uInt32 cChar,
HTMLOutContext& rContext,
OUString *pNonConvertableChars );
SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const OUString&,
rtl_TextEncoding eDestEnc,
OUString *pNonConvertableChars = nullptr );
- SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen,
- rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 );
+ SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen );
SVT_DLLPUBLIC static SvStream& Out_Color( SvStream&, const Color& );
SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const OUString&, const ImageMap&, const OUString&,
const HTMLOutEvent *pEventTable,
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index 3c5efe0fafea..2fef8b7fb7c9 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -237,9 +237,6 @@ protected:
virtual void Update();
- // calculation of boundary values for object borders
- // values refer to the page
- static bool CalcLimits(long &nMax1, long &nMax2, bool bFirst);
bool IsActLastColumn(
bool bForceDontConsiderHidden = false,
sal_uInt16 nAct=USHRT_MAX) const;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 5d4669eb5749..e85d6de002c0 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -986,8 +986,7 @@ public:
static void RemoveMakeObjectHdl(Link<SdrObjCreatorParams, SdrObject*> const & rLink);
private:
- static SVX_DLLPRIVATE SdrObject* CreateObjectFromFactory(
- SdrInventor nInventor, sal_uInt16 nIdentifier, SdrPage* pPage, SdrModel* pModel );
+ static SVX_DLLPRIVATE SdrObject* CreateObjectFromFactory( SdrInventor nInventor, sal_uInt16 nIdentifier );
SdrObjFactory() = delete;
};
diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx
index 19b5b3c43881..7cbfa15486bc 100644
--- a/include/svx/xit.hxx
+++ b/include/svx/xit.hxx
@@ -63,7 +63,7 @@ public:
Argument pPool2 can be null.
If returned string equals NameOrIndex->GetName(), the name was already unique.
*/
- static OUString CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, const char* pPrefixResId, const XPropertyListRef &pDefaults );
+ static OUString CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, SvxCompareValueFunc pCompareValueFunc, const char* pPrefixResId, const XPropertyListRef &pDefaults );
void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx
index 81379c33eb2c..b5c09d83d37f 100644
--- a/include/vbahelper/vbaeventshelperbase.hxx
+++ b/include/vbahelper/vbaeventshelperbase.hxx
@@ -61,8 +61,7 @@ class VBAHELPER_DLLPUBLIC VbaEventsHelperBase : public VbaEventsHelperBase_BASE
{
public:
VbaEventsHelperBase(
- const css::uno::Sequence< css::uno::Any >& rArgs,
- const css::uno::Reference< css::uno::XComponentContext >& xContext );
+ const css::uno::Sequence< css::uno::Any >& rArgs );
virtual ~VbaEventsHelperBase() override;
// script::vba::XVBAEventProcessor
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index 909382d01c78..525b4237795a 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@ -197,7 +197,7 @@ class VBAHELPER_DLLPUBLIC ConcreteXShapeGeometryAttributes : public AbstractGeom
{
std::unique_ptr< ShapeHelper > m_pShapeHelper;
public:
- ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape );
+ ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::drawing::XShape >& xShape );
virtual double getLeft() const override;
virtual void setLeft( double nLeft ) override;
virtual double getTop() const override;
@@ -215,7 +215,6 @@ class VBAHELPER_DLLPUBLIC UserFormGeometryHelper : public AbstractGeometryAttrib
{
public:
UserFormGeometryHelper(
- const css::uno::Reference< css::uno::XComponentContext >& xContext,
const css::uno::Reference< css::awt::XControl >& xControl,
double fOffsetX, double fOffsetY );
virtual double getLeft() const override;