diff options
author | Susobhan Ghosh <susobhang70@gmail.com> | 2016-06-07 19:20:22 +0530 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-06-23 13:15:07 +0000 |
commit | 3881fffe4233ce3aa02051b205c114c1cb520d67 (patch) | |
tree | 455a1b8230155788b62e82d2ee89f3e1a4fdbce9 /svx | |
parent | 2fe32490f097ac107603ba5b1fa15599d720b8f6 (diff) |
tdf#83830: Page Styles Panel
Added new helper class to svx for numbering
Change-Id: Ie7db4059568024e9bed460fcf7c9215bd2ef788f
Reviewed-on: https://gerrit.libreoffice.org/26020
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/AllLangResTarget_svx.mk | 1 | ||||
-rw-r--r-- | svx/Library_svxcore.mk | 2 | ||||
-rw-r--r-- | svx/source/dialog/SvxNumOptionsTabPageHelper.cxx | 91 | ||||
-rw-r--r-- | svx/source/dialog/pagenumbering.src | 31 | ||||
-rw-r--r-- | svx/source/dialog/pagenumberlistbox.cxx | 69 |
5 files changed, 194 insertions, 0 deletions
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index 18e52d63507d..d33f37d31023 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -45,6 +45,7 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\ svx/source/dialog/imapdlg.src \ svx/source/dialog/language.src \ svx/source/dialog/page.src \ + svx/source/dialog/pagenumbering.src \ svx/source/dialog/passwd.src \ svx/source/dialog/prtqry.src \ svx/source/dialog/ruler.src \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index 9bb991da1289..f5c38f373b08 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -118,9 +118,11 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/dialog/hexcolorcontrol \ svx/source/dialog/framelink \ svx/source/dialog/langbox \ + svx/source/dialog/pagenumberlistbox \ svx/source/dialog/papersizelistbox \ svx/source/dialog/stddlg \ svx/source/dialog/svxdlg \ + svx/source/dialog/SvxNumOptionsTabPageHelper \ svx/source/engine3d/camera3d \ svx/source/engine3d/cube3d \ svx/source/engine3d/deflt3d \ diff --git a/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx b/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx new file mode 100644 index 000000000000..0d467080b2c0 --- /dev/null +++ b/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx @@ -0,0 +1,91 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include <svx/SvxNumOptionsTabPageHelper.hxx> +#include <com/sun/star/style/NumberingType.hpp> + +using namespace css; +using namespace css::uno; +using namespace css::text; +using namespace css::style; + +Reference<XDefaultNumberingProvider> SvxNumOptionsTabPageHelper::GetNumberingProvider() +{ + Reference<XComponentContext> xContext( ::comphelper::getProcessComponentContext() ); + Reference<XDefaultNumberingProvider> xRet = text::DefaultNumberingProvider::create(xContext); + return xRet; +} + +void SvxNumOptionsTabPageHelper::GetI18nNumbering( ListBox& rFmtLB, sal_uInt16 nDoNotRemove ) +{ + Reference<XDefaultNumberingProvider> xDefNum = GetNumberingProvider(); + Reference<XNumberingTypeInfo> xInfo(xDefNum, UNO_QUERY); + + // Extended numbering schemes present in the resource but not offered by + // the i18n framework per configuration must be removed from the listbox. + // Do not remove a special entry matching nDoNotRemove. + const sal_uInt16 nDontRemove = SAL_MAX_UINT16; + ::std::vector< sal_uInt16> aRemove( rFmtLB.GetEntryCount(), nDontRemove); + for (size_t i=0; i<aRemove.size(); ++i) + { + sal_uInt16 nEntryData = (sal_uInt16)reinterpret_cast<sal_uLong>(rFmtLB.GetEntryData( + sal::static_int_cast< sal_Int32 >(i))); + if (nEntryData > NumberingType::CHARS_LOWER_LETTER_N && nEntryData != nDoNotRemove) + aRemove[i] = nEntryData; + } + if(xInfo.is()) + { + Sequence<sal_Int16> aTypes = xInfo->getSupportedNumberingTypes( ); + const sal_Int16* pTypes = aTypes.getConstArray(); + for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++) + { + sal_Int16 nCurrent = pTypes[nType]; + if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N) + { + bool bInsert = true; + for(sal_Int32 nEntry = 0; nEntry < rFmtLB.GetEntryCount(); nEntry++) + { + sal_uInt16 nEntryData = (sal_uInt16)reinterpret_cast<sal_uLong>(rFmtLB.GetEntryData(nEntry)); + if(nEntryData == (sal_uInt16) nCurrent) + { + bInsert = false; + aRemove[nEntry] = nDontRemove; + break; + } + } + if(bInsert) + { + OUString aIdent = xInfo->getNumberingIdentifier( nCurrent ); + sal_Int32 nPos = rFmtLB.InsertEntry(aIdent); + rFmtLB.SetEntryData(nPos, reinterpret_cast<void*>((sal_uLong)nCurrent)); + } + } + } + } + for (unsigned short i : aRemove) + { + if (i != nDontRemove) + { + sal_Int32 nPos = rFmtLB.GetEntryPos( reinterpret_cast<void*>((sal_uLong)i)); + rFmtLB.RemoveEntry( nPos); + } + } +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/pagenumbering.src b/svx/source/dialog/pagenumbering.src new file mode 100644 index 000000000000..3f9c7fd0c83c --- /dev/null +++ b/svx/source/dialog/pagenumbering.src @@ -0,0 +1,31 @@ +#include <svx/dialogs.hrc> + +StringArray RID_SVXSTRARY_PAGE_NUMBERING +{ + ItemList [ en-US ] = + { + < "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC */; > ; + < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ; + < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ; + < "I, II, III, ..." ; 2/*SVX_NUM_ROMAN_UPPER */; > ; + < "i, ii, iii, ..." ; 3/*SVX_NUM_ROMAN_LOWER */; > ; + < "None" ; 5/*SVX_NUM_NUMBER_NONE */; > ; + < "A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ; + < "a, .., aa, .., aaa, ..." ; 10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ; + < "Native Numbering" ; 12 /*NATIVE_NUMBERING */; > ; + < "А, Б, .., Аа, Аб, ... (Bulgarian)" ; 38 /*CHARS_CYRILLIC_UPPER_LETTER_BG */; > ; + < "а, б, .., аа, аб, ... (Bulgarian)" ; 39 /*CHARS_CYRILLIC_LOWER_LETTER_BG */; > ; + < "А, Б, .., Аа, Бб, ... (Bulgarian)" ; 40 /*CHARS_CYRILLIC_UPPER_LETTER_N_BG */; > ; + < "а, б, .., аа, бб, ... (Bulgarian)" ; 41 /*CHARS_CYRILLIC_LOWER_LETTER_N_BG */; > ; + < "А, Б, .., Аа, Аб, ... (Russian)" ; 42 /*CHARS_CYRILLIC_UPPER_LETTER_RU */; > ; + < "а, б, .., аа, аб, ... (Russian)" ; 43 /*CHARS_CYRILLIC_LOWER_LETTER_RU */; > ; + < "А, Б, .., Аа, Бб, ... (Russian)" ; 44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU */; > ; + < "а, б, .., аа, бб, ... (Russian)" ; 45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU */; > ; + < "А, Б, .., Аа, Аб, ... (Serbian)" ; 48 /*CHARS_CYRILLIC_UPPER_LETTER_SR */; > ; + < "а, б, .., аа, аб, ... (Serbian)" ; 49 /*CHARS_CYRILLIC_LOWER_LETTER_SR */; > ; + < "А, Б, .., Аа, Бб, ... (Serbian)" ; 50 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR */; > ; + < "а, б, .., аа, бб, ... (Serbian)" ; 51 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR */; > ; + < "Α, Β, Γ, ... (Greek Upper Letter)"; 52 /*CHARS_GREEK_UPPER_LETTER */; > ; + < "α, β, γ, ... (Greek Lower Letter)"; 53 /*CHARS_GREEK_LOWER_LETTER */; > ; + }; +};
\ No newline at end of file diff --git a/svx/source/dialog/pagenumberlistbox.cxx b/svx/source/dialog/pagenumberlistbox.cxx new file mode 100644 index 000000000000..46c13d4fa281 --- /dev/null +++ b/svx/source/dialog/pagenumberlistbox.cxx @@ -0,0 +1,69 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#include <svx/dialogs.hrc> +#include <svx/dialmgr.hxx> +#include <svx/pagenumberlistbox.hxx> +#include <tools/resary.hxx> +#include <vcl/builderfactory.hxx> + +PageNumberListBox::PageNumberListBox(vcl::Window* pParent, WinBits nStyle) + : ListBox( pParent, nStyle) +{ + ResStringArray aPaperAry( SVX_RES( RID_SVXSTRARY_PAGE_NUMBERING ) ); + sal_uInt32 nCnt = aPaperAry.Count(); + + for ( sal_uInt32 i = 0; i < nCnt; ++i ) + { + OUString aStr = aPaperAry.GetString(i); + sal_uInt16 nData = aPaperAry.GetValue(i); + sal_Int32 nPos = InsertEntry( aStr ); + SetEntryData( nPos, reinterpret_cast<void*>((sal_uLong)nData) ); + } +} + +VCL_BUILDER_FACTORY(PageNumberListBox); + +void PageNumberListBox::SetSelection( sal_uInt16 nPos ) +{ + sal_Int32 nEntryCount = GetEntryCount(); + sal_Int32 nSelPos = LISTBOX_ENTRY_NOTFOUND; + sal_Int32 nUserPos = LISTBOX_ENTRY_NOTFOUND; + + for (sal_Int32 i = 0; i < nEntryCount; ++i ) + { + sal_uInt16 nTmp = (sal_uInt16)reinterpret_cast<sal_uLong>(GetEntryData(i)); + + if ( nTmp == nPos ) + { + nSelPos = i; + break; + } + } + SelectEntryPos( ( nSelPos != LISTBOX_ENTRY_NOTFOUND ) ? nSelPos : nUserPos ); +} + +sal_uInt16 PageNumberListBox::GetSelection() const +{ + const sal_Int32 nPos = GetSelectEntryPos(); + sal_uInt16 nData = (sal_uInt16)reinterpret_cast<sal_uLong>(GetEntryData( nPos )); + + return nData; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |