summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorJakub Trzebiatowski <ubap.dev@gmail.com>2016-07-28 15:33:17 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-08-01 14:03:07 +0000
commite7ea91f283ce9b96db58087d87d81d29bcb727a4 (patch)
tree5c5f8b1fe17d0eba63d4d180a1b76f02f3e1744a /sfx2
parentd1ffaf5315497140dedbc67c78f14706591b314e (diff)
GSoC Writer Table Styles; Table Styles Panel
Table styles panel: + Added simple table style panel tab icon. icon-themes/galaxy/sw/imglst/sf06.png + Listing table styles (hierarchical, same order as in container) + Listing all table styles (sorted by name). + Listing applied table styles. + Listing custom styles. + Listing hidden styles. + Hide/show style. + Applying style by double clicking. + Highlight current table style. Everything else yet to be done. Table styles (SwTableAutoFormat): + "hidden" property. + "userDefined" property. "Default style" is not user defined. Styles loaded from tblauto.fmt are also not user defined. Styles loaded from .odt are user defined. Styles created manually (before binary load/save roundtrip) are user defined. Change-Id: I739a48ae1d7ae66f4f8c08076871437ca491bd4e Reviewed-on: https://gerrit.libreoffice.org/27638 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/sdi/sfx.sdi17
-rw-r--r--sfx2/source/dialog/templdlg.cxx5
-rw-r--r--sfx2/source/dialog/tplcitem.cxx3
-rw-r--r--sfx2/source/inc/templdgi.hxx4
4 files changed, 27 insertions, 2 deletions
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 7e396afc617c..f5e366abcdb1 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4459,6 +4459,23 @@ SfxTemplateItem ListStyle SID_STYLE_FAMILY5
GroupId = GID_DOCUMENT;
]
+SfxTemplateItem TableStyle SID_STYLE_FAMILY6
+
+[
+ AutoUpdate = FALSE,
+ FastCall = FALSE,
+ ReadOnlyDoc = TRUE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+
+
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_DOCUMENT;
+]
SfxBoolItem TipsDialog SID_TIPWINDOW
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index e185487513a7..f0a5369abdf6 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -754,6 +754,8 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
nSlot = SID_STYLE_FAMILY4; break;
case SfxStyleFamily::Pseudo:
nSlot = SID_STYLE_FAMILY5; break;
+ case SfxStyleFamily::Table:
+ nSlot = SID_STYLE_FAMILY6; break;
default: OSL_FAIL("unknown StyleFamily"); break;
}
pBoundItems[i] =
@@ -896,6 +898,7 @@ namespace SfxTemplate
case SfxStyleFamily::Frame: return 3;
case SfxStyleFamily::Page: return 4;
case SfxStyleFamily::Pseudo: return 5;
+ case SfxStyleFamily::Table: return 6;
default: return 0;
}
}
@@ -909,6 +912,7 @@ namespace SfxTemplate
case 3: return SfxStyleFamily::Frame;
case 4: return SfxStyleFamily::Page;
case 5: return SfxStyleFamily::Pseudo;
+ case 6: return SfxStyleFamily::Table;
default: return SfxStyleFamily::All;
}
}
@@ -2291,6 +2295,7 @@ void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId,const SfxStyleFamil
case SfxStyleFamily::Frame: sHelpId = ".uno:FrameStyle"; break;
case SfxStyleFamily::Page: sHelpId = ".uno:PageStyle"; break;
case SfxStyleFamily::Pseudo: sHelpId = ".uno:ListStyle"; break;
+ case SfxStyleFamily::Table: sHelpId = ".uno:TableStyle"; break;
default: OSL_FAIL("unknown StyleFamily"); break;
}
m_aActionTbL->InsertItem( nId, pItem->GetImage(), pItem->GetText(), ToolBoxItemBits::NONE, 0);
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 714a2aaaa0d2..e0916ba64450 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -63,6 +63,7 @@ void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eSta
case SID_STYLE_FAMILY3:
case SID_STYLE_FAMILY4:
case SID_STYLE_FAMILY5:
+ case SID_STYLE_FAMILY6:
{
bool bAvailable = SfxItemState::DEFAULT == eState;
if ( !bAvailable )
@@ -87,6 +88,8 @@ void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eSta
nFamily = 4; break;
case SID_STYLE_FAMILY5:
nFamily = 5; break;
+ case SID_STYLE_FAMILY6:
+ nFamily = 6; break;
default: OSL_FAIL("unknown StyleFamily"); break;
}
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 385a40a5a1d1..0938658da8b7 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -162,8 +162,8 @@ private:
DeletionWatcher* impl_setDeletionWatcher(DeletionWatcher* pNewWatcher);
protected:
-#define MAX_FAMILIES 5
-#define COUNT_BOUND_FUNC 13
+#define MAX_FAMILIES 6
+#define COUNT_BOUND_FUNC 14
friend class DropListBox_Impl;
friend class SfxTemplateControllerItem;