diff options
| author | Hannah Meeks <hmeeks4135@gmail.com> | 2022-12-23 21:54:01 +0000 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-02-20 16:55:31 +0000 |
| commit | 0548269ca03f093c41f6292e783cc6c77328808e (patch) | |
| tree | a71544a66c43a6341607e61a2f5d9e0b9130ae16 /include | |
| parent | 9ba251fb3e7d3b76c8ce730e4b3a3a7859bc119b (diff) | |
VBA: Remove conversions in writer from OORGBTOXLRGB (XLRGB is actually BGR!)
Enum to store if document is Writer or Calc because font colors are treated
differently depending on this:
In writer the colors come in as RGB but in calc they are in BGR and both palettes
are in RBG so we only need this conversion for calc.
Includes testdoc for calc - to show this still works
Change-Id: I79d9d585dbfc527c0781543ce1f1095c4db190b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144788
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vbahelper/vbafontbase.hxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/vbahelper/vbafontbase.hxx b/include/vbahelper/vbafontbase.hxx index 732a67bc1d1e..d388715c93ba 100644 --- a/include/vbahelper/vbafontbase.hxx +++ b/include/vbahelper/vbafontbase.hxx @@ -44,9 +44,13 @@ typedef InheritedHelperInterfaceWeakImpl< ov::XFontBase > VbaFontBase_BASE; class VBAHELPER_DLLPUBLIC VbaFontBase : public VbaFontBase_BASE { +public: + enum Component { WORD, EXCEL }; + protected: css::uno::Reference< css::beans::XPropertySet > mxFont; css::uno::Reference< css::container::XIndexAccess > mxPalette; + Component meWhich; bool mbFormControl; public: @@ -79,7 +83,9 @@ public: const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xPalette, const css::uno::Reference< css::beans::XPropertySet >& xPropertySet, - bool bFormControl = false ); + Component eWhich, + bool bFormControl = false); + virtual ~VbaFontBase() override;// {} // Attributes |