summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--include/svtools/htmlkywd.hxx2
-rw-r--r--include/svtools/htmltokn.h2
-rw-r--r--include/svx/dlgctl3d.hxx1
-rw-r--r--include/svx/sdrmasterpagedescriptor.hxx3
-rw-r--r--include/svx/sdrpageuser.hxx3
-rw-r--r--include/svx/sidebar/ValueSetWithTextControl.hxx1
-rw-r--r--include/svx/svdpage.hxx1
-rw-r--r--include/test/unoapixml_test.hxx7
-rw-r--r--include/test/xmltesttools.hxx3
-rw-r--r--include/vcl/print.hxx1
-rw-r--r--include/vcl/rendercontext/State.hxx4
11 files changed, 22 insertions, 6 deletions
diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index 23e836ea7c..36e853960f 100644
--- a/include/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
@@ -447,6 +447,8 @@
#define OOO_STRING_SVTOOLS_HTML_O_SDval "sdval"
#define OOO_STRING_SVTOOLS_HTML_O_DSval "data-sheets-value"
#define OOO_STRING_SVTOOLS_HTML_O_SDnum "sdnum"
+#define OOO_STRING_SVTOOLS_HTML_O_DSnum "data-sheets-numberformat"
+#define OOO_STRING_SVTOOLS_HTML_O_DSformula "data-sheets-formula"
#define OOO_STRING_SVTOOLS_HTML_O_sdlibrary "sdlibrary"
#define OOO_STRING_SVTOOLS_HTML_O_sdmodule "sdmodule"
#define OOO_STRING_SVTOOLS_HTML_O_sdevent "sdevent-"
diff --git a/include/svtools/htmltokn.h b/include/svtools/htmltokn.h
index 27370e5cb8..89d8ee8685 100644
--- a/include/svtools/htmltokn.h
+++ b/include/svtools/htmltokn.h
@@ -346,6 +346,8 @@ STRING_START = BOOL_END,
SDVAL, // StarDiv NumberValue
DSVAL,
SDNUM, // StarDiv NumberFormat
+ DSNUM,
+ DSFORMULA,
SDLIBRARY,
SDMODULE,
STRING_END,
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index 16873e7b3e..191b9b413a 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -61,6 +61,7 @@ public:
SvxPreviewObjectType GetObjectType() const { return mnObjectType; }
SfxItemSet const & Get3DAttributes() const;
virtual void Set3DAttributes(const SfxItemSet& rAttr);
+ void ClearPageView();
};
class SAL_WARN_UNUSED SVX_DLLPUBLIC Svx3DLightControl final : public Svx3DPreviewControl
diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx
index d7eac22a1b..9be1e663bc 100644
--- a/include/svx/sdrmasterpagedescriptor.hxx
+++ b/include/svx/sdrmasterpagedescriptor.hxx
@@ -22,6 +22,7 @@
#include <svx/sdrpageuser.hxx>
#include <svx/svdsob.hxx>
+#include <svx/svxdllapi.h>
#include <memory>
class SdrPageProperties;
@@ -30,7 +31,7 @@ namespace sdr::contact { class ViewContact; }
namespace sdr
{
- class MasterPageDescriptor final : public sdr::PageUser
+ class SVXCORE_DLLPUBLIC MasterPageDescriptor final : public sdr::PageUser
{
private:
SdrPage& maOwnerPage;
diff --git a/include/svx/sdrpageuser.hxx b/include/svx/sdrpageuser.hxx
index 8c31a2936c..5557b27297 100644
--- a/include/svx/sdrpageuser.hxx
+++ b/include/svx/sdrpageuser.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SVX_SDRPAGEUSER_HXX
#include <vector>
+#include <svx/svxdllapi.h>
class SdrPage;
@@ -30,7 +31,7 @@ class SdrPage;
namespace sdr
{
- class PageUser
+ class SVXCORE_DLLPUBLIC PageUser
{
public:
// this method is called from the destructor of the referenced page.
diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx
index 407e960675..ac397f9fda 100644
--- a/include/svx/sidebar/ValueSetWithTextControl.hxx
+++ b/include/svx/sidebar/ValueSetWithTextControl.hxx
@@ -40,7 +40,6 @@ public:
SVX_DLLPRIVATE virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
- void SetOptimalDrawingAreaHeight();
void AddItem(const OUString& rItemText, const OUString& rItemText2);
SVX_DLLPRIVATE virtual void UserDraw(const UserDrawEvent& rUDEvt) override;
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index c70a2f1f4a..cb1e7f9f0b 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -405,6 +405,7 @@ private:
public:
void AddPageUser(sdr::PageUser& rNewUser);
void RemovePageUser(sdr::PageUser& rOldUser);
+ const sdr::PageUserVector& GetPageUsers() const { return maPageUsers; };
// SdrModel access on SdrPage level
SdrModel& getSdrModelFromSdrPage() const { return mrSdrModelFromSdrPage; }
diff --git a/include/test/unoapixml_test.hxx b/include/test/unoapixml_test.hxx
index 660fda6c20..569be11790 100644
--- a/include/test/unoapixml_test.hxx
+++ b/include/test/unoapixml_test.hxx
@@ -23,6 +23,13 @@ public:
UnoApiXmlTest(OUString path);
xmlDocUniquePtr parseExport(OUString const& rStreamName);
+
+ /**
+ * Returns an xml stream of an exported file.
+ * To be used when the exporter doesn't create zip archives, but single files
+ * (like Flat ODF Export)
+ */
+ xmlDocUniquePtr parseExportedFile();
};
#endif // INCLUDED_TEST_UNOAPIXML_TEST_HXX
diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx
index d18b5d51e8..bf91c5b201 100644
--- a/include/test/xmltesttools.hxx
+++ b/include/test/xmltesttools.hxx
@@ -104,6 +104,9 @@ protected:
* Assert that rXPath exists, has exactly 1 result set nodes and does *not* have an attribute named rAttribute.
*/
void assertXPathNoAttribute(const xmlDocUniquePtr& pXmlDoc, const OString& rXPath, const OString& rAttribute);
+ // Assert that the node name of the single node returned by an XPath is as specified,
+ // e.g. to check order of elements, where getXPathPosition is unapplicable
+ void assertXPathNodeName(const xmlDocUniquePtr& pXmlDoc, const OString& rXPath, const OString& rExpectedName);
static void registerODFNamespaces(xmlXPathContextPtr& pXmlXpathCtx);
static void registerOOXMLNamespaces(xmlXPathContextPtr& pXmlXpathCtx);
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index e23cf8d0af..e7c88f56bd 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -228,6 +228,7 @@ public:
bool SetPaperBin( sal_uInt16 nPaperBin );
sal_uInt16 GetPaperBin() const;
sal_uInt16 GetPaperBinBySourceIndex(sal_uInt16 nPaperSource) const;
+ sal_uInt16 GetSourceIndexByPaperBin(sal_uInt16 nPaperBin) const;
void SetPaper( Paper ePaper );
bool SetPaperSizeUser( const Size& rSize );
/** @return The paper format of the printer's current "jobsetup". Note that if PAPER_USER the actual size can be anything. */
diff --git a/include/vcl/rendercontext/State.hxx b/include/vcl/rendercontext/State.hxx
index 0359a486e4..0a3d4327af 100644
--- a/include/vcl/rendercontext/State.hxx
+++ b/include/vcl/rendercontext/State.hxx
@@ -53,7 +53,6 @@ enum class PushFlags
TEXTLAYOUTMODE = 0x0800,
TEXTLANGUAGE = 0x1000,
OVERLINECOLOR = 0x2000,
- RTLENABLED = 0x4000,
ALL = 0xFFFF
};
}
@@ -67,7 +66,7 @@ template <> struct typed_flags<vcl::PushFlags> : is_typed_flags<vcl::PushFlags,
#define PUSH_ALLFONT \
(vcl::PushFlags::TEXTCOLOR | vcl::PushFlags::TEXTFILLCOLOR | vcl::PushFlags::TEXTLINECOLOR \
| vcl::PushFlags::OVERLINECOLOR | vcl::PushFlags::TEXTALIGN | vcl::PushFlags::TEXTLAYOUTMODE \
- | vcl::PushFlags::TEXTLANGUAGE | vcl::PushFlags::RTLENABLED | vcl::PushFlags::FONT)
+ | vcl::PushFlags::TEXTLANGUAGE | vcl::PushFlags::FONT)
namespace vcl::text
{
@@ -115,7 +114,6 @@ struct State
LanguageType meTextLanguage = LANGUAGE_SYSTEM;
PushFlags mnFlags = PushFlags::NONE;
bool mbMapActive = false;
- bool mbRTLEnabled = false;
};
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 15:00:47 +0000