[Libreoffice-commits] core.git: Changes to 'refs/changes/85/1285/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/1474/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/10/5510/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/10/5510/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/1285/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/74/1474/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/10/5510/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/00/8200/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/81/2781/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/3954/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/05/1305/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/45/3145/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/97/4797/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/371/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/81/2781/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/00/8200/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/54/3954/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/45/3145/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/45/345/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/42/5642/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/02/1302/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/4092/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/19/7719/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/40/5640/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/70/1070/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/12/3912/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/89/3789/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/98/3498/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/72/5672/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/1971/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/53/1053/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/71/1971/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/30/5030/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/19/7719/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/69/4069/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/20/1820/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/41/1041/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/69/369/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/12/3912/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/99/8199/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/40/5640/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/69/4069/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/30/5030/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/91/1391/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/91/591/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/4092/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/99/8199/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/55/1155/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/21/321/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/05/3305/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/3134/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/05/3305/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/55/1155/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/3134/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/82/2782/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/34/3134/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/82/2782/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/94/2094/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/44/5944/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/44/5944/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/44/5944/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/56/2356/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/56/2356/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/33/3133/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/33/3133/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 251fd06de2c7bd2e46fd257d848acbebb93e1fab Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Wed Apr 16 11:55:04 2014 +0300 fdo#77123: Add Ignore Kashida to quick find if the CTL enabled the ignore kashida option will work when you use the quick find toolbar. Change-Id: I6dd9d4b3fa96c0d1c47a044e813c4062b8678ea2 diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 6df2de7..2309224 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -110,6 +110,7 @@ void impl_executeSearch( const css::uno::Reference css::uno::XComponentContext sal_Int32 nFlags = 0; nFlags |= (!aMatchCase ? static_castint(com::sun::star::i18n::TransliterationModules_IGNORE_CASE) : 0); nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL:0 ); +nFlags |= (aCTLOptions.IsCTLFontEnabled() ? com::sun::star::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL:0 ); lArgs[3].Value = nFlags; lArgs[4].Name = OUString(SEARCHITEM_COMMAND); lArgs[4].Value = (sal_Int16)(aFindAll ? ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source i18npool/inc i18npool/Library_i18npool.mk i18npool/source i18npool/util include/svx include/unotools offapi/com officecfg/registry svl/source svx/source svx/
cui/source/options/optgdlg.cxx |1
i18npool/Library_i18npool.mk |1
i18npool/inc/transliteration_Ignore.hxx|4 +
i18npool/source/localedata/data/ar_EG.xml |1
i18npool/source/registerservices/registerservices.cxx |2
i18npool/source/transliteration/ignoreKashida_CTL.cxx | 35
++
i18npool/source/transliteration/transliterationImpl.cxx|4 +
i18npool/util/i18npool.component |3
include/svx/srchdlg.hxx|1
include/unotools/searchopt.hxx |2
offapi/com/sun/star/i18n/TransliterationModules.idl|1
offapi/com/sun/star/i18n/TransliterationModulesExtra.idl |2
officecfg/registry/schema/org/openoffice/Office/Common.xcs |9 ++
officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs |6 +
svl/source/items/srchitem.cxx |5 +
svx/source/dialog/srchdlg.cxx | 13 +++
svx/uiconfig/ui/findreplacedialog.ui | 16
unotools/source/config/searchopt.cxx | 17
18 files changed, 118 insertions(+), 5 deletions(-)
New commits:
commit d2771b63b94a8aae3c25c83e9dae9f83242f46c1
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Tue Apr 8 09:42:20 2014 +0300
fdo#77123: Add option ignore kashida to the search
This patch will add new checkbox to ignore kashida in the
search and replace dialog.
Change-Id: I9e7179242751103b8418d922ade5b9145170ad15
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 4453b50..f833d44 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1394,6 +1394,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet rSet )
{
SvtSearchOptions aOpt;
aOpt.SetIgnoreDiacritics_CTL (true);
+aOpt.SetIgnoreKashida_CTL (true);
pLangConfig-aLanguageOptions.SetCTLFontEnabled(
m_pCTLSupportCB-IsChecked() );
const sal_uInt16 STATE_COUNT = 1;
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
index f8900bf..4f9e599 100644
--- a/i18npool/Library_i18npool.mk
+++ b/i18npool/Library_i18npool.mk
@@ -94,6 +94,7 @@ $(eval $(call gb_Library_add_exception_objects,i18npool,\
i18npool/source/transliteration/ignoreWidth \
i18npool/source/transliteration/ignoreZiZu_ja_JP \
i18npool/source/transliteration/ignoreDiacritics_CTL \
+ i18npool/source/transliteration/ignoreKashida_CTL \
i18npool/source/transliteration/katakanaToHiragana \
i18npool/source/transliteration/largeToSmall_ja_JP \
i18npool/source/transliteration/numtochar \
diff --git a/i18npool/inc/transliteration_Ignore.hxx
b/i18npool/inc/transliteration_Ignore.hxx
index a1aa29e..691b867 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -118,6 +118,10 @@ TRANSLITERATION_IGNORE(ZiZu_ja_JP)
TRANSLITERATION_IGNORE(Diacritics_CTL)
#endif
+#if defined( TRANSLITERATION_Kashida_CTL ) || defined( TRANSLITERATION_ALL )
+TRANSLITERATION_IGNORE(Kashida_CTL)
+#endif
+
#undef TRANSLITERATION_IGNORE
#define TRANSLITERATION_IGNORE( name ) \
diff --git a/i18npool/source/localedata/data/ar_EG.xml
b/i18npool/source/localedata/data/ar_EG.xml
index 662a913..7e52d51 100644
--- a/i18npool/source/localedata/data/ar_EG.xml
+++ b/i18npool/source/localedata/data/ar_EG.xml
@@ -466,6 +466,7 @@
Transliteration unoid=TOGGLE_CASE/
Transliteration unoid=IGNORE_CASE/
Transliteration unoid=ignoreDiacritics_CTL/
+Transliteration unoid=ignoreKashida_CTL/
/LC_TRANSLITERATION
LC_MISC
ReservedWords
diff --git a/i18npool/source/registerservices/registerservices.cxx
b/i18npool/source/registerservices/registerservices.cxx
index 93b38d7..67c59e6 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -156,6 +156,7 @@ IMPL_CREATEINSTANCE( ignoreProlongedSoundMark_ja_JP)
IMPL_CREATEINSTANCE( ignoreMiddleDot_ja_JP)
IMPL_CREATEINSTANCE( ignoreSpace_ja_JP)
IMPL_CREATEINSTANCE( ignoreDiacritics_CTL)
+IMPL_CREATEINSTANCE( ignoreKashida_CTL)
IMPL_CREATEINSTANCE( TextToChuyin_zh_TW )
IMPL_CREATEINSTANCE( TextToPinyin_zh_CN )
@@ -381,6 +382,7 @@ static const struct InstancesArray {
IMPL_TRANSLITERATION_ITEM (TextToPinyin_zh_CN),
IMPL_TRANSLITERATION_ITEM (TextToChuyin_zh_TW),
IMPL_TRANSLITERATION_ITEM( ignoreDiacritics_CTL),
+IMPL_TRANSLITERATION_ITEM (ignoreKashida_CTL),
IMPL_TRANSLITERATION_ITEM (NumToCharUpper_zh_CN),
IMPL_TRANSLITERATION_ITEM (NumToCharLower_zh_CN),
diff --git a/i18npool/source/transliteration/ignoreKashida_CTL.cxx
b/i18npool/source
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/svx svx/source
include/svx/dlgctrl.hxx |2 +-
svx/source/dialog/dlgctrl.cxx | 27 +++
2 files changed, 16 insertions(+), 13 deletions(-)
New commits:
commit 1027e2be99f133ea30e5b81bf65b1c301a0a5866
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Mon Feb 24 10:35:36 2014 +0300
fdo#74751: fix reverse base point diagram on RTL UI
Change-Id: Ib8e9f40b5576116f0220ffa70390f95b28c8bae0
Reviewed-on: https://gerrit.libreoffice.org/8200
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 6cca020..b6434b7 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -88,7 +88,7 @@ protected:
sal_BoolmbCompleteDisable;
-RECT_POINT GetRPFromPoint( Point ) const;
+RECT_POINT GetRPFromPoint( Point, bool bRTL = false ) const;
Point GetPointFromRP( RECT_POINT ) const;
voidSetFocusRect( const Rectangle* pRect = NULL ); //
pRect == NULL - calculate rectangle in method
Point SetActualRPWithoutInvalidate( RECT_POINT eNewRP ); //
returns the last point
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 330a9c9..61f6bd1 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -571,7 +571,9 @@ Point SvxRectCtl::SetActualRPWithoutInvalidate( RECT_POINT
eNewRP )
if( (m_nState CS_NOVERT) != 0 )
aPtNew.Y() = aPtMM.Y();
-eNewRP = GetRPFromPoint( aPtNew );
+// fdo#74751 this fix reverse base point on RTL UI.
+bool bRTL = Application::GetSettings().GetLayoutRTL();
+eNewRP = GetRPFromPoint( aPtNew, bRTL );
eDefRP = eNewRP;
eRP = eNewRP;
@@ -627,19 +629,20 @@ Point SvxRectCtl::GetApproxLogPtFromPixPt( const Point
rPt ) const
// Converts Point in RECT_POINT
-RECT_POINT SvxRectCtl::GetRPFromPoint( Point aPt ) const
+RECT_POINT SvxRectCtl::GetRPFromPoint( Point aPt, bool bRTL ) const
{
-if ( aPt == aPtLT) return RP_LT;
-else if( aPt == aPtMT) return RP_MT;
-else if( aPt == aPtRT) return RP_RT;
-else if( aPt == aPtLM) return RP_LM;
-else if( aPt == aPtRM) return RP_RM;
-else if( aPt == aPtLB) return RP_LB;
-else if( aPt == aPtMB) return RP_MB;
-else if( aPt == aPtRB) return RP_RB;
+RECT_POINT rPoint = RP_MM; // default
-else
-return RP_MM; // default
+if ( aPt == aPtLT) rPoint = bRTL ? RP_RT : RP_LT;
+else if( aPt == aPtMT) rPoint = RP_MT;
+else if( aPt == aPtRT) rPoint = bRTL ? RP_LT : RP_RT;
+else if( aPt == aPtLM) rPoint = bRTL ? RP_RM : RP_LM;
+else if( aPt == aPtRM) rPoint = bRTL ? RP_LM : RP_RM;
+else if( aPt == aPtLB) rPoint = bRTL ? RP_RB : RP_LB;
+else if( aPt == aPtMB) rPoint = RP_MB;
+else if( aPt == aPtRB) rPoint = bRTL ? RP_LB : RP_RB;
+
+return rPoint;
}
// Resets to the original state of the control
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source
sfx2/source/control/thumbnailview.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c2ebcf3377bbb0826a193572b708d56eb6ca42a2
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Mon Feb 24 10:29:51 2014 +0300
fdo#73869 fix highlight RTL Problem at the StartCenter window.
Change-Id: I2fb5bf97941478781c0a77b55d4454acd00f903b
Reviewed-on: https://gerrit.libreoffice.org/8199
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 35380a8..3c6d094 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -86,7 +86,7 @@ ThumbnailView::~ThumbnailView()
void ThumbnailView::MouseMove(const MouseEvent rMEvt)
{
size_t nItemCount = mFilteredItemList.size();
-Point aPoint = GetPointerState().maPos;
+Point aPoint = rMEvt.GetPosPixel();
OUString aHelp;
for (size_t i = 0; i nItemCount; i++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/dlgctrl.hxx |2 +-
svx/source/dialog/dlgctrl.cxx | 27 +++
2 files changed, 16 insertions(+), 13 deletions(-)
New commits:
commit e5ebee7ebb8ad9fae9d50b0708dc120c1d2eb32c
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Sun Feb 23 09:41:15 2014 +0300
fdo#74751: fix reverse base point diagram on RTL UI
Change-Id: I3f3f2d59952577b0533a9d8ef6d27af849bd6bdb
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 6d18ea46..38c0efd 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -89,7 +89,7 @@ protected:
sal_BoolmbCompleteDisable;
-RECT_POINT GetRPFromPoint( Point ) const;
+RECT_POINT GetRPFromPoint( Point, bool bRTL = false ) const;
Point GetPointFromRP( RECT_POINT ) const;
voidSetFocusRect( const Rectangle* pRect = NULL ); //
pRect == NULL - calculate rectangle in method
Point SetActualRPWithoutInvalidate( RECT_POINT eNewRP ); //
returns the last point
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index b0614b7..abe1214 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -558,7 +558,9 @@ Point SvxRectCtl::SetActualRPWithoutInvalidate( RECT_POINT
eNewRP )
if( (m_nState CS_NOVERT) != 0 )
aPtNew.Y() = aPtMM.Y();
-eNewRP = GetRPFromPoint( aPtNew );
+// fdo#74751 this fix reverse base point on RTL UI.
+bool bRTL = Application::GetSettings().GetLayoutRTL();
+eNewRP = GetRPFromPoint( aPtNew, bRTL );
eDefRP = eNewRP;
eRP = eNewRP;
@@ -621,19 +623,20 @@ Point SvxRectCtl::GetApproxLogPtFromPixPt( const Point
rPt ) const
// Converts Point in RECT_POINT
-RECT_POINT SvxRectCtl::GetRPFromPoint( Point aPt ) const
+RECT_POINT SvxRectCtl::GetRPFromPoint( Point aPt, bool bRTL ) const
{
-if ( aPt == aPtLT) return RP_LT;
-else if( aPt == aPtMT) return RP_MT;
-else if( aPt == aPtRT) return RP_RT;
-else if( aPt == aPtLM) return RP_LM;
-else if( aPt == aPtRM) return RP_RM;
-else if( aPt == aPtLB) return RP_LB;
-else if( aPt == aPtMB) return RP_MB;
-else if( aPt == aPtRB) return RP_RB;
+RECT_POINT rPoint = RP_MM; // default
-else
-return RP_MM; // default
+if ( aPt == aPtLT) rPoint = bRTL ? RP_RT : RP_LT;
+else if( aPt == aPtMT) rPoint = RP_MT;
+else if( aPt == aPtRT) rPoint = bRTL ? RP_LT : RP_RT;
+else if( aPt == aPtLM) rPoint = bRTL ? RP_RM : RP_LM;
+else if( aPt == aPtRM) rPoint = bRTL ? RP_LM : RP_RM;
+else if( aPt == aPtLB) rPoint = bRTL ? RP_RB : RP_LB;
+else if( aPt == aPtMB) rPoint = RP_MB;
+else if( aPt == aPtRB) rPoint = bRTL ? RP_LB : RP_RB;
+
+return rPoint;
}
// Resets to the original state of the control
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/thumbnailview.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f5115e33e4c5e49e9b79ed32fccc193a99c3dc30
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Wed Jan 29 12:49:42 2014 +0300
fdo#73869 fix highlight RTL Problem at the StartCenter window.
Change-Id: I744d8f85c6e4c555ef8916281ebdc709fe6ddfa9
Reviewed-on: https://gerrit.libreoffice.org/7719
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 06f5800..eda19f0 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -86,7 +86,7 @@ ThumbnailView::~ThumbnailView()
void ThumbnailView::MouseMove(const MouseEvent rMEvt)
{
size_t nItemCount = mFilteredItemList.size();
-Point aPoint = GetPointerState().maPos;
+Point aPoint = rMEvt.GetPosPixel();
OUString aHelp;
for (size_t i = 0; i nItemCount; i++)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa writerfilter/inc writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo72560.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 14 ++
writerfilter/inc/dmapper/DomainMapper.hxx|1 -
writerfilter/source/dmapper/DomainMapper.cxx | 25 ++---
4 files changed, 32 insertions(+), 8 deletions(-)
New commits:
commit 66e68fe28a7bfb37d4fdeee9bed1d9a0ff840935
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Thu Dec 12 08:20:00 2013 +0300
DOCX: fdo#72560 better solution for exchange alignment for RTL
Change-Id: I39462fc722a58b32e8829a9f2005a411871f255d
diff --git a/sw/qa/extras/ooxmlimport/data/fdo72560.docx
b/sw/qa/extras/ooxmlimport/data/fdo72560.docx
new file mode 100644
index 000..b21535b
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo72560.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index d957b98..8153131 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1545,6 +1545,20 @@ DECLARE_OOXMLIMPORT_TEST(testLOCrash,file_crash.docx)
//The problem was libreoffice crash while opening the file.
getParagraph(1,Contents);
}
+
+DECLARE_OOXMLIMPORT_TEST(testFdo72560, fdo72560.docx)
+{
+// The problem was libreoffice confuse when there RTL default style for
paragraph
+uno::Referenceuno::XInterface xParaLeftRTL(getParagraph( 1, RTL LEFT));
+uno::Referenceuno::XInterface xParaRightLTR(getParagraph( 2, LTR
RIGHT));
+
+// this will test the text direction and alignment for paragraphs
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, getPropertysal_Int16(
xParaLeftRTL, WritingMode ));
+CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_LEFT),
getProperty sal_Int32 ( xParaLeftRTL, ParaAdjust ));
+
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, getPropertysal_Int16(
xParaRightLTR, WritingMode ));
+CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_RIGHT),
getProperty sal_Int32 ( xParaRightLTR, ParaAdjust ));
+}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx
b/writerfilter/inc/dmapper/DomainMapper.hxx
index d6b5d37..70c5b51 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -163,7 +163,6 @@ private:
sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue);
sal_Int32 mnBackgroundColor;
bool mbIsHighlightSet;
-bool mbIsBIDI;
boost::scoped_ptr GraphicZOrderHelper zOrderHelper;
};
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 06ea11c..e60ffbc 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -97,7 +97,7 @@ LoggedProperties(dmapper_logger, DomainMapper),
LoggedTable(dmapper_logger, DomainMapper),
LoggedStream(dmapper_logger, DomainMapper),
m_pImpl( new DomainMapper_Impl( *this, xContext, xModel, eDocumentType,
xInsertTextRange, bIsNewDoc )),
-mnBackgroundColor(0), mbIsHighlightSet(false), mbIsBIDI(false)
+mnBackgroundColor(0), mbIsHighlightSet(false)
{
// #i24363# tab stops relative to indent
m_pImpl-SetDocumentSettingsProperty(
@@ -1580,7 +1580,7 @@ sal_Int32
lcl_getCurrentNumberingProperty(uno::Referencecontainer::XIndexAccess
}
// In rtl-paragraphs the meaning of left/right are to be exchanged
-static bool ExchangeLeftRight( const PropertyMapPtr rContext, bool
mbIsBIDI)
+static bool ExchangeLeftRight( const PropertyMapPtr rContext,
DomainMapper_Impl* m_pImpl )
{
bool bExchangeLeftRight = false;
PropertyMap::const_iterator aPropParaIte =
rContext-find(PROP_WRITING_MODE);
@@ -1591,7 +1591,20 @@ sal_Int32
lcl_getCurrentNumberingProperty(uno::Referencecontainer::XIndexAccess
bExchangeLeftRight = true;
}
else
-return mbIsBIDI;
+{
+// check if there RTL bidi in default style for the paragraph
+StyleSheetEntryPtr pTable =
m_pImpl-GetStyleSheetTable()-FindDefaultParaStyle();
+if ( pTable )
+{
+PropertyMap::const_iterator aPropStyle =
pTable-pProperties-find(PROP_WRITING_MODE);
+if( aPropStyle != pTable-pProperties-end())
+{
+sal_Int32 aDirect;
+if( (aPropStyle-second.getValue() = aDirect) aDirect ==
text::WritingMode2::RL_TB )
+bExchangeLeftRight = true;
+}
+}
+}
return bExchangeLeftRight;
}
@@ -1621,7 +1634,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
break; // sprmPIncLvl
case NS_sprm::LN_PJcExtra: // sprmPJc Asian (undocumented)
case NS_sprm::LN_PJc: // sprmPJc
-handleParaJustification(nIntValue, rContext, ExchangeLeftRight(
rContext, mbIsBIDI ));
+handleParaJustification(nIntValue, rContext, ExchangeLeftRight(
rContext, m_pImpl
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa writerfilter/inc writerfilter/source
dev/null |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 14 --
writerfilter/inc/dmapper/DomainMapper.hxx|1 +
writerfilter/source/dmapper/DomainMapper.cxx | 25 +++--
4 files changed, 8 insertions(+), 32 deletions(-)
New commits:
commit e2de109a7424bc1ab59867dfd23a10db28b7bf9a
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Sun Dec 15 08:47:45 2013 +0300
Revert DOCX: fdo#72560 better solution for exchange alignment for RTL
This reverts commit 66e68fe28a7bfb37d4fdeee9bed1d9a0ff840935.
there some error in this patch.
diff --git a/sw/qa/extras/ooxmlimport/data/fdo72560.docx
b/sw/qa/extras/ooxmlimport/data/fdo72560.docx
deleted file mode 100644
index b21535b..000
Binary files a/sw/qa/extras/ooxmlimport/data/fdo72560.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 8153131..d957b98 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1545,20 +1545,6 @@ DECLARE_OOXMLIMPORT_TEST(testLOCrash,file_crash.docx)
//The problem was libreoffice crash while opening the file.
getParagraph(1,Contents);
}
-
-DECLARE_OOXMLIMPORT_TEST(testFdo72560, fdo72560.docx)
-{
-// The problem was libreoffice confuse when there RTL default style for
paragraph
-uno::Referenceuno::XInterface xParaLeftRTL(getParagraph( 1, RTL LEFT));
-uno::Referenceuno::XInterface xParaRightLTR(getParagraph( 2, LTR
RIGHT));
-
-// this will test the text direction and alignment for paragraphs
-CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, getPropertysal_Int16(
xParaLeftRTL, WritingMode ));
-CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_LEFT),
getProperty sal_Int32 ( xParaLeftRTL, ParaAdjust ));
-
-CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, getPropertysal_Int16(
xParaRightLTR, WritingMode ));
-CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_RIGHT),
getProperty sal_Int32 ( xParaRightLTR, ParaAdjust ));
-}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx
b/writerfilter/inc/dmapper/DomainMapper.hxx
index 70c5b51..d6b5d37 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -163,6 +163,7 @@ private:
sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue);
sal_Int32 mnBackgroundColor;
bool mbIsHighlightSet;
+bool mbIsBIDI;
boost::scoped_ptr GraphicZOrderHelper zOrderHelper;
};
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index e60ffbc..06ea11c 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -97,7 +97,7 @@ LoggedProperties(dmapper_logger, DomainMapper),
LoggedTable(dmapper_logger, DomainMapper),
LoggedStream(dmapper_logger, DomainMapper),
m_pImpl( new DomainMapper_Impl( *this, xContext, xModel, eDocumentType,
xInsertTextRange, bIsNewDoc )),
-mnBackgroundColor(0), mbIsHighlightSet(false)
+mnBackgroundColor(0), mbIsHighlightSet(false), mbIsBIDI(false)
{
// #i24363# tab stops relative to indent
m_pImpl-SetDocumentSettingsProperty(
@@ -1580,7 +1580,7 @@ sal_Int32
lcl_getCurrentNumberingProperty(uno::Referencecontainer::XIndexAccess
}
// In rtl-paragraphs the meaning of left/right are to be exchanged
-static bool ExchangeLeftRight( const PropertyMapPtr rContext,
DomainMapper_Impl* m_pImpl )
+static bool ExchangeLeftRight( const PropertyMapPtr rContext, bool
mbIsBIDI)
{
bool bExchangeLeftRight = false;
PropertyMap::const_iterator aPropParaIte =
rContext-find(PROP_WRITING_MODE);
@@ -1591,20 +1591,7 @@ static bool ExchangeLeftRight( const PropertyMapPtr
rContext, DomainMapper_Impl*
bExchangeLeftRight = true;
}
else
-{
-// check if there RTL bidi in default style for the paragraph
-StyleSheetEntryPtr pTable =
m_pImpl-GetStyleSheetTable()-FindDefaultParaStyle();
-if ( pTable )
-{
-PropertyMap::const_iterator aPropStyle =
pTable-pProperties-find(PROP_WRITING_MODE);
-if( aPropStyle != pTable-pProperties-end())
-{
-sal_Int32 aDirect;
-if( (aPropStyle-second.getValue() = aDirect) aDirect ==
text::WritingMode2::RL_TB )
-bExchangeLeftRight = true;
-}
-}
-}
+return mbIsBIDI;
return bExchangeLeftRight;
}
@@ -1634,7 +1621,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
break; // sprmPIncLvl
case NS_sprm::LN_PJcExtra: // sprmPJc Asian (undocumented)
case NS_sprm::LN_PJc: // sprmPJc
-handleParaJustification(nIntValue, rContext, ExchangeLeftRight(
rContext, m_pImpl ));
+handleParaJustification
[Libreoffice-commits] core.git: sw/qa writerfilter/inc writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo72560.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 14 ++
writerfilter/inc/dmapper/DomainMapper.hxx|1 -
writerfilter/source/dmapper/DomainMapper.cxx | 25 ++---
4 files changed, 32 insertions(+), 8 deletions(-)
New commits:
commit b0db93d00e1dd208baa96eb3e10df12950cdcb49
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Thu Dec 12 08:20:00 2013 +0300
DOCX: fdo#72560 better solution for exchange alignment for RTL
Change-Id: I39462fc722a58b32e8829a9f2005a411871f255d
diff --git a/sw/qa/extras/ooxmlimport/data/fdo72560.docx
b/sw/qa/extras/ooxmlimport/data/fdo72560.docx
new file mode 100644
index 000..b21535b
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo72560.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 5da974f..db722f6 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1638,6 +1638,20 @@ DECLARE_OOXMLIMPORT_TEST(testLOCrash,file_crash.docx)
//The problem was libreoffice crash while opening the file.
getParagraph(1,Contents);
}
+
+DECLARE_OOXMLIMPORT_TEST(testFdo72560, fdo72560.docx)
+{
+// The problem was libreoffice confuse when there RTL default style for
paragraph
+uno::Referenceuno::XInterface xParaLeftRTL(getParagraph( 1, RTL LEFT));
+uno::Referenceuno::XInterface xParaRightLTR(getParagraph( 2, LTR
RIGHT));
+
+// this will test the text direction and alignment for paragraphs
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, getPropertysal_Int16(
xParaLeftRTL, WritingMode ));
+CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_LEFT),
getProperty sal_Int32 ( xParaLeftRTL, ParaAdjust ));
+
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, getPropertysal_Int16(
xParaRightLTR, WritingMode ));
+CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_RIGHT),
getProperty sal_Int32 ( xParaRightLTR, ParaAdjust ));
+}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx
b/writerfilter/inc/dmapper/DomainMapper.hxx
index 9775bac..4a168d9 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -165,7 +165,6 @@ private:
sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue);
sal_Int32 mnBackgroundColor;
bool mbIsHighlightSet;
-bool mbIsBIDI;
bool mbIsSplitPara;
boost::scoped_ptr GraphicZOrderHelper zOrderHelper;
};
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 2fcd4fb..26dfa11 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -97,7 +97,7 @@ LoggedProperties(dmapper_logger, DomainMapper),
LoggedTable(dmapper_logger, DomainMapper),
LoggedStream(dmapper_logger, DomainMapper),
m_pImpl( new DomainMapper_Impl( *this, xContext, xModel, eDocumentType,
xInsertTextRange, bIsNewDoc )),
-mnBackgroundColor(0), mbIsHighlightSet(false), mbIsBIDI(false),
mbIsSplitPara(false)
+mnBackgroundColor(0), mbIsHighlightSet(false), mbIsSplitPara(false)
{
// #i24363# tab stops relative to indent
m_pImpl-SetDocumentSettingsProperty(
@@ -1597,7 +1597,7 @@ sal_Int32
lcl_getCurrentNumberingProperty(uno::Referencecontainer::XIndexAccess
}
// In rtl-paragraphs the meaning of left/right are to be exchanged
-static bool ExchangeLeftRight( const PropertyMapPtr rContext, bool
mbIsBIDI)
+static bool ExchangeLeftRight( const PropertyMapPtr rContext,
DomainMapper_Impl* m_pImpl )
{
bool bExchangeLeftRight = false;
PropertyMap::const_iterator aPropParaIte =
rContext-find(PROP_WRITING_MODE);
@@ -1608,7 +1608,20 @@ sal_Int32
lcl_getCurrentNumberingProperty(uno::Referencecontainer::XIndexAccess
bExchangeLeftRight = true;
}
else
-return mbIsBIDI;
+{
+// check if there RTL bidi in default style for the paragraph
+StyleSheetEntryPtr pTable =
m_pImpl-GetStyleSheetTable()-FindDefaultParaStyle();
+if ( pTable )
+{
+PropertyMap::const_iterator aPropStyle =
pTable-pProperties-find(PROP_WRITING_MODE);
+if( aPropStyle != pTable-pProperties-end())
+{
+sal_Int32 aDirect;
+if( (aPropStyle-second.getValue() = aDirect) aDirect ==
text::WritingMode2::RL_TB )
+bExchangeLeftRight = true;
+}
+}
+}
return bExchangeLeftRight;
}
@@ -1638,7 +1651,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
break; // sprmPIncLvl
case NS_sprm::LN_PJcExtra: // sprmPJc Asian (undocumented)
case NS_sprm::LN_PJc: // sprmPJc
-handleParaJustification(nIntValue, rContext, ExchangeLeftRight(
rContext, mbIsBIDI
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtw8nds.cxx | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 4add062a1b1feb11f9b14d3a0593a8f9b27f2404
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Sun Dec 8 09:59:11 2013 +0300
docx: fdo#44029 export the right alignment when locale are RTL.
Change-Id: I771eb0d0a90816f0c4cbd66cfcb755f67455bb9b
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index 9fd7336..faae557 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -25,6 +25,7 @@
#include functional
#include iostream
+#include i18nlangtag/mslangid.hxx
#include hintids.hxx
#include comphelper/string.hxx
#include tools/urlobj.hxx
@@ -1291,11 +1292,21 @@ short MSWordExportBase::GetDefaultFrameDirection( )
const
nDir = pDoc-GetTextDirection( aPos );
}
else if ( pOutFmtNode-ISA( SwTxtFmtColl ) )
-nDir = FRMDIR_HORI_LEFT_TOP;//what else can we do :-(
+{
+if ( MsLangId::isRightToLeft(
static_castLanguageType(GetAppLanguage())) )
+nDir = FRMDIR_HORI_RIGHT_TOP;
+else
+nDir = FRMDIR_HORI_LEFT_TOP;//what else can we do :-(
+}
}
if ( nDir == FRMDIR_ENVIRONMENT )
-nDir = FRMDIR_HORI_LEFT_TOP;//Set something
+{
+if( MsLangId::isRightToLeft(
static_castLanguageType(GetAppLanguage())) )
+nDir = FRMDIR_HORI_RIGHT_TOP;
+else
+nDir = FRMDIR_HORI_LEFT_TOP;//Set something
+}
return nDir;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/wrtw8nds.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 3f7cbf4e338d7fa036b07f50c569d07be0cab8fe
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Sun Dec 8 10:27:44 2013 +0300
put comment for the previous patch.
Change-Id: Id9cee84530d00d6d2528d038464e885e1286dfe5
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index faae557..7c36579 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1302,6 +1302,7 @@ short MSWordExportBase::GetDefaultFrameDirection( ) const
if ( nDir == FRMDIR_ENVIRONMENT )
{
+// fdo#44029 put direction right when the locale are RTL.
if( MsLangId::isRightToLeft(
static_castLanguageType(GetAppLanguage())) )
nDir = FRMDIR_HORI_RIGHT_TOP;
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo71646.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12
sw/source/filter/ww8/docxattributeoutput.cxx |2 ++
3 files changed, 14 insertions(+)
New commits:
commit 84b3d6dc3a7d5ba52b00285e59e7aa6b5ca15837
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Fri Nov 15 18:09:21 2013 +0300
DOCX:fdo#71646 fix wrong direction when save the file.
Change-Id: I6f3dcf1007e91551e1f3335f4c40424add1c45c3
diff --git a/sw/qa/extras/ooxmlexport/data/fdo71646.docx
b/sw/qa/extras/ooxmlexport/data/fdo71646.docx
new file mode 100644
index 000..d49d88b
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo71646.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 13c0bf1..1bf422f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1820,6 +1820,18 @@ DECLARE_OOXML_TEST(testCellGridSpan,
cell-grid-span.docx)
assertXPath(pXmlDoc,
/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:tcPr/w:gridSpan,0);
assertXPath(pXmlDoc,
/w:document/w:body/w:tbl/w:tr/w:tc[2]/w:tcPr/w:gridSpan,0);
}
+DECLARE_OOXML_TEST(testFdo71646, fdo71646.docx)
+{
+// The problem was after save file created by MS the direction changed to
RTL.
+uno::Referenceuno::XInterface xParaLTRLeft(getParagraph( 1, LTR LEFT));
+sal_Int32 nLTRLeft = getProperty sal_Int32 ( xParaLTRLeft, ParaAdjust
);
+// test the text Direction value for the pragraph
+sal_Int16 nLRDir = getProperty sal_Int32 ( xParaLTRLeft, WritingMode
);
+
+// this will test the both the text direction and alignment for paragraph
+CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_LEFT), nLTRLeft);
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, nLRDir);
+}
#endif
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 54e0a5f..9e41119 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6157,6 +6157,8 @@ void DocxAttributeOutput::FormatFrameDirection( const
SvxFrameDirectionItem rDi
{
if ( bBiDi )
m_pSerializer-singleElementNS( XML_w, XML_bidi, FSNS( XML_w,
XML_val ), 1, FSEND );
+else
+m_pSerializer-singleElementNS( XML_w, XML_bidi, FSNS( XML_w,
XML_val ), 0, FSEND );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/StyleSheetTable.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 3f9e7e72c53ecbe8ee1ab060f811cb41eadfc7e1 Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Wed Nov 13 22:23:05 2013 +0300 DOCX: fdo#43093 set alignment if not already set Change-Id: I34d2c6c1fc9338cea025ac510621d370f23805a2 diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 2a672f7..329cc63 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -1062,6 +1062,8 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable ) // Left-to-right direction if not already set pEntry-pProperties-Insert(PROP_WRITING_MODE, uno::makeAny( sal_Int16(text::WritingMode_LR_TB) ), false); +// Left aligment if not already set +pEntry-pProperties-Insert(PROP_PARA_ADJUST, uno::makeAny( sal_Int16(style::ParagraphAdjust_LEFT) ), false); } uno::Sequence beans::PropertyValue aPropValues = pEntry-pProperties-GetPropertyValues(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/inc writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo43093.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 45 --
writerfilter/inc/dmapper/DomainMapper.hxx |1
writerfilter/source/dmapper/DomainMapper.cxx | 17 +-
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 14 -
5 files changed, 57 insertions(+), 20 deletions(-)
New commits:
commit aa52753785154f0e95fed559f613f5eae9105dcf
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Mon Oct 7 10:26:30 2013 +0300
DOCX:fdo#43093 fix wrong direction and alignment for RTL
Change-Id: If362d80a86a7493f2d43e6d661b94fc03942711f
diff --git a/sw/qa/extras/ooxmlimport/data/fdo43093.docx
b/sw/qa/extras/ooxmlimport/data/fdo43093.docx
new file mode 100644
index 000..3e5a910
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo43093.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index b1c4583..2239540 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -138,6 +138,7 @@ public:
void testFdo69636();
void testChartProp();
void testBnc779620();
+void testFdo43093();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -240,6 +241,7 @@ void Test::run()
{fdo69636.docx, Test::testFdo69636},
{chart-prop.docx, Test::testChartProp},
{bnc779620.docx, Test::testBnc779620},
+{fdo43093.docx, Test::testFdo43093},
};
header();
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
@@ -1356,9 +1358,12 @@ void Test::testN779630()
void Test::testIndentation()
{
-uno::Referencebeans::XPropertySet
xPropertySet(getStyles(ParagraphStyles)-getByName(Standard),
uno::UNO_QUERY);
-// This was RL_TB (e.g. right-to-left).
-CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB,
getPropertysal_Int16(xPropertySet, WritingMode));
+uno::Referenceuno::XInterface xParaLTRTitle(getParagraph( 1, Title
aligned));
+uno::Referenceuno::XInterface xParaLTRNormal(getParagraph( 2, ));
+
+// this will test the text direction for paragraphs
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, getPropertysal_Int16(
xParaLTRTitle, WritingMode ));
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, getPropertysal_Int16(
xParaLTRNormal, WritingMode ));
}
void Test::testPageBorderShadow()
@@ -1594,6 +1599,40 @@ void Test::testBnc779620()
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess-getCount());
}
+void Test::testFdo43093()
+{
+// The problem was that the direction and alignment are not correct for
RTL paragraphs.
+uno::Referenceuno::XInterface xParaRtlRight(getParagraph( 1, Right and
RTL in M$));
+sal_Int32 nRtlRight = getProperty sal_Int32 ( xParaRtlRight,
ParaAdjust );
+sal_Int16 nRRDir = getProperty sal_Int32 ( xParaRtlRight, WritingMode
);
+
+uno::Referenceuno::XInterface xParaRtlLeft(getParagraph( 2, Left and
RTL in M$));
+sal_Int32 nRtlLeft = getProperty sal_Int32 ( xParaRtlLeft, ParaAdjust
);
+sal_Int16 nRLDir = getProperty sal_Int32 ( xParaRtlLeft, WritingMode
);
+
+uno::Referenceuno::XInterface xParaLtrRight(getParagraph( 3, Right and
LTR in M$));
+sal_Int32 nLtrRight = getProperty sal_Int32 ( xParaLtrRight,
ParaAdjust );
+sal_Int16 nLRDir = getProperty sal_Int32 ( xParaLtrRight, WritingMode
);
+
+uno::Referenceuno::XInterface xParaLtrLeft(getParagraph( 4, Left and
LTR in M$));
+sal_Int32 nLtrLeft = getProperty sal_Int32 ( xParaLtrLeft, ParaAdjust
);
+sal_Int16 nLLDir = getProperty sal_Int32 ( xParaLtrLeft, WritingMode
);
+
+// this will test the both the text direction and alignment for each
paragraph
+CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_RIGHT), nRtlRight);
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, nRRDir);
+
+CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_LEFT), nRtlLeft);
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, nRLDir);
+
+CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_RIGHT), nLtrRight);
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, nLRDir);
+
+CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_LEFT), nLtrLeft);
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, nLLDir);
+}
+
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/inc/dmapper/DomainMapper.hxx
b/writerfilter/inc/dmapper/DomainMapper.hxx
index 8dc82fe..a879115 100644
--- a/writerfilter/inc/dmapper/DomainMapper.hxx
+++ b/writerfilter/inc/dmapper/DomainMapper.hxx
@@ -158,6 +158,7 @@ private:
sal_Unicode getFillCharFromValue(const sal_Int32 nIntValue);
sal_Int32 mnBackgroundColor;
bool mbIsHighlightSet;
+bool mbIsBIDI;
boost::scoped_ptr GraphicZOrderHelper zOrderHelper;
};
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1
cui/source/inc/helpid.hrc|1
cui/source/options/optjava.cxx | 80 -
cui/source/options/optjava.hrc | 42
cui/source/options/optjava.hxx | 20 --
cui/source/options/optjava.src | 81 -
cui/uiconfig/ui/javastartparametersdialog.ui | 233 +++
7 files changed, 276 insertions(+), 182 deletions(-)
New commits:
commit 59ff29f82514b277dc245cad4d535b192f44b129
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Mon Sep 9 13:29:38 2013 +0300
Convert java start parameters dialog to .ui
Change-Id: Ib3aaeb751ae67c0ed4e444f6febd676ddd94f924
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index ade8143..d325fd3 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/insertplugin \
cui/uiconfig/ui/insertrowcolumn \
cui/uiconfig/ui/javaclasspathdialog \
+ cui/uiconfig/ui/javastartparametersdialog \
cui/uiconfig/ui/linedialog \
cui/uiconfig/ui/linetabpage \
cui/uiconfig/ui/lineendstabpage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 2303504..882b10c 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -33,7 +33,6 @@
#define HID_CLB_LINGU_OPTIONS CUI_HID_CLB_LINGU_OPTIONS
#define HID_EDIT_MODULES CUI_HID_EDIT_MODULES
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
-#define HID_OPTIONS_JAVA_PARAMETER CUI_HID_OPTIONS_JAVA_PARAMETER
#define HID_OFADLG_OPTIONS_TREE CUI_HID_OFADLG_OPTIONS_TREE
#define HID_OFA_CONNPOOL_DRIVERLIST CUI_HID_OFA_CONNPOOL_DRIVERLIST
#define UID_OFA_CONNPOOL_DRIVERLIST_BACK CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 4dfc7a5..00b2744 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -24,7 +24,6 @@
#include svtools/miscopt.hxx
-#include optjava.hrc
#include cuires.hrc
#include helpid.hrc
#include vcl/svapp.hxx
@@ -780,30 +779,23 @@ void SvxJavaOptionsPage::FillUserData()
SvxJavaParameterDlg::SvxJavaParameterDlg( Window* pParent ) :
-ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_PARAMETER ) ),
-
-m_aParameterLabel ( this, CUI_RES( FT_PARAMETER ) ),
-m_aParameterEdit( this, CUI_RES( ED_PARAMETER ) ),
-m_aAssignBtn( this, CUI_RES( PB_ASSIGN ) ),
-m_aAssignedLabel( this, CUI_RES( FT_ASSIGNED ) ),
-m_aAssignedList ( this, CUI_RES( LB_ASSIGNED ) ),
-m_aExampleText ( this, CUI_RES( FT_EXAMPLE ) ),
-m_aRemoveBtn( this, CUI_RES( PB_REMOVE ) ),
-m_aButtonsLine ( this, CUI_RES( FL_BUTTONS ) ),
-m_aOKBtn( this, CUI_RES( PB_PARAMETER_OK ) ),
-m_aCancelBtn( this, CUI_RES( PB_PARAMETER_ESC ) ),
-m_aHelpBtn ( this, CUI_RES( PB_PARAMETER_HLP ) )
-
+ModalDialog( pParent, JavaStartParameters,
+ cui/ui/javastartparametersdialog.ui )
{
-FreeResource();
-
-m_aParameterEdit.SetModifyHdl( LINK( this, SvxJavaParameterDlg,
ModifyHdl_Impl ) );
-m_aAssignBtn.SetClickHdl( LINK( this, SvxJavaParameterDlg, AssignHdl_Impl
) );
-m_aRemoveBtn.SetClickHdl( LINK( this, SvxJavaParameterDlg, RemoveHdl_Impl
) );
-m_aAssignedList.SetSelectHdl( LINK( this, SvxJavaParameterDlg,
SelectHdl_Impl ) );
-m_aAssignedList.SetDoubleClickHdl( LINK( this, SvxJavaParameterDlg,
DblClickHdl_Impl ) );
-
-ModifyHdl_Impl( m_aParameterEdit );
+get( m_pParameterEdit, parameterfield);
+get( m_pAssignBtn, assignbtn);
+get( m_pAssignedList, assignlist);
+m_pAssignedList-SetDropDownLineCount(6);
+
m_pAssignedList-set_width_request(m_pAssignedList-approximate_char_width() *
54);
+get( m_pRemoveBtn, removebtn);
+
+m_pParameterEdit-SetModifyHdl( LINK( this, SvxJavaParameterDlg,
ModifyHdl_Impl ) );
+m_pAssignBtn-SetClickHdl( LINK( this, SvxJavaParameterDlg, AssignHdl_Impl
) );
+m_pRemoveBtn-SetClickHdl( LINK( this, SvxJavaParameterDlg, RemoveHdl_Impl
) );
+m_pAssignedList-SetSelectHdl( LINK( this, SvxJavaParameterDlg,
SelectHdl_Impl ) );
+m_pAssignedList-SetDoubleClickHdl( LINK( this, SvxJavaParameterDlg,
DblClickHdl_Impl ) );
+
+ModifyHdl_Impl( m_pParameterEdit );
EnableRemoveButton();
}
@@ -817,8 +809,8 @@ SvxJavaParameterDlg::~SvxJavaParameterDlg()
IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl)
{
-OUString sParam = comphelper::string::strip(m_aParameterEdit.GetText(), '
');
-m_aAssignBtn.Enable(!sParam.isEmpty());
+OUString sParam = comphelper::string::strip(m_pParameterEdit-GetText(), '
');
+m_pAssignBtn-Enable(!sParam.isEmpty());
return 0;
}
@@ -827,15 +819,15 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl)
IMPL_LINK_NOARG
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dd05923399a5815499ee5cdc035487b0e41709d1 Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Mon Sep 9 14:45:00 2013 +0300 Updated core Project: help d730745a16c469744f38da47b08f7710eda469e3 diff --git a/helpcontent2 b/helpcontent2 index e3c18f7..d730745 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e3c18f7032e9f321f09d6f6401a4e9bf46313b93 +Subproject commit d730745a16c469744f38da47b08f7710eda469e3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |5 - source/text/shared/optionen/javaparameters.xhp | 16 2 files changed, 8 insertions(+), 13 deletions(-) New commits: commit d730745a16c469744f38da47b08f7710eda469e3 Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Mon Sep 9 14:45:00 2013 +0300 update help ids for java parameters .ui conversion Change-Id: Ic354278c35e5bc3f9850607426499fe640dd131b diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 4ad3034..aaac29a 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2590,7 +2590,6 @@ HID_OPTIONS_COLORCONFIG_NAME_SCHEME,39875, HID_OPTIONS_DICT_EDIT,33815, HID_OPTIONS_DICT_EDIT_ENTRIES_LIST,39896, HID_OPTIONS_DICT_NEW,33814, -HID_OPTIONS_JAVA_PARAMETER,39998, HID_OPTIONS_LINGU,33812, HID_OPTIONS_MULTIPATH_LIST,40056, HID_OPTIONS_PATHS_SELECTFOLDER,39876, @@ -6721,7 +6720,6 @@ svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_NAME,1368918028, svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_REF,1368918034, svx_Edit_RID_SVXDLG_ASSIGNCOMPONENT_EDIT_METHOD,1242449965, svx_Edit_RID_SVXDLG_IMAP_EDT_TEXT,2318698497, -svx_Edit_RID_SVXDLG_JAVA_PARAMETER_ED_PARAMETER,1241745419, svx_Edit_RID_SVXDLG_MANAGE_NAMESPACE_ED_PREFIX,1368901643, svx_Edit_RID_SVXDLG_MANAGE_NAMESPACE_ED_URL,1368901645, svx_Edit_RID_SVXDLG_PASSWORD_ED_NEW_PASSWD,1239894037, @@ -6865,7 +6863,6 @@ svx_ListBox_RID_SVXDLG_BMPMASK_LB_TRANS,3391950341, svx_ListBox_RID_SVXDLG_EDIT_MODULES_LB_EDIT_MODULES_LANGUAGE,1251200831, svx_ListBox_RID_SVXDLG_FONTWORK_CLB_SHADOW_COLOR,3386592769, svx_ListBox_RID_SVXDLG_GALLERY_THEMEID_LB_RESNAME,1243631105, -svx_ListBox_RID_SVXDLG_JAVA_PARAMETER_LB_ASSIGNED,1241746965, svx_ListBox_RID_SVXDLG_MULTIPATH_LB_MULTIPATH,1240878603, svx_ListBox_RID_SVXDLG_RUBY_LB_ADJUST,2315374103, svx_ListBox_RID_SVXDLG_RUBY_LB_CHAR_STYLE,2315374083, @@ -7095,8 +7092,6 @@ svx_PushButton_RID_SVXDLG_BMPMASK_BTN_EXEC,3391951361, svx_PushButton_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_BACK,1251201847, svx_PushButton_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_DOWN,1251201846, svx_PushButton_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_UP,1251201845, -svx_PushButton_RID_SVXDLG_JAVA_PARAMETER_PB_ASSIGN,1241747980, -svx_PushButton_RID_SVXDLG_JAVA_PARAMETER_PB_REMOVE,1241747991, svx_PushButton_RID_SVXDLG_MULTIPATH_BTN_ADD_MULTIPATH,1240879630, svx_PushButton_RID_SVXDLG_MULTIPATH_BTN_DEL_MULTIPATH,1240879631, svx_PushButton_RID_SVXDLG_NAMESPACE_ITEM_PB_ADD_NAMESPACE,1368887820, diff --git a/source/text/shared/optionen/javaparameters.xhp b/source/text/shared/optionen/javaparameters.xhp index 9fa6469..239cb87 100644 --- a/source/text/shared/optionen/javaparameters.xhp +++ b/source/text/shared/optionen/javaparameters.xhp @@ -38,9 +38,9 @@ dedr: reviewed/lastedited section id=howtoget embed href=text/shared/00/0406.xhp#advanced/ /section -bookmark xml-lang=en-US branch=hid/cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER id=bm_id1370891 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/JavaStartParameters/parameterfield id=bm_id1370891 localize=false/ paragraph role=heading id=par_idN10568 xml-lang=en-US level=2 l10n=NEWJava Start parameter/paragraph -paragraph role=paragraph id=par_idN1056C xml-lang=en-US l10n=NEWahelp hid=svx:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETEREnter a start parameter for a JRE as you would on a command line. Click Assign to add the parameter to the list of available start parameters./ahelp/paragraph +paragraph role=paragraph id=par_idN1056C xml-lang=en-US l10n=NEWahelp hid=cui/ui/JavaStartParameters/parameterfieldEnter a start parameter for a JRE as you would on a command line. Click Assign to add the parameter to the list of available start parameters./ahelp/paragraph paragraph role=note id=par_id5404522 xml-lang=en-US l10n=NEWDo not use escape characters or quotes in path names./paragraph paragraph role=paragraph id=par_idN105D8 xml-lang=en-US l10n=NEWFor example, to point the system property myprop to a folder, enter the following parameter:/paragraph paragraph role=example id=par_idN105DD xml-lang=en-US l10n=NEW-Dmyprop=c:\program files\java/paragraph @@ -48,14 +48,14 @@ dedr: reviewed/lastedited paragraph role=example id=par_idN1057E xml-lang=en-US l10n=NEW-Xdebug/paragraph paragraph role=example id=par_idN10581 xml-lang=en-US l10n=NEW-Xrunjdwp:transport=dt_socket,server=y,address=8000/paragraph paragraph role=note id=par_idN1060C xml-lang=en-US l10n=NEWThese changes take effect after you restart %PRODUCTNAME./paragraph -bookmark xml-lang=en-US branch=hid/cui:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED id=bm_id9206518 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/JavaStartParameters/assignlist id=bm_id9206518 localize=false/ paragraph role=heading id=par_idN1058C xml-lang=en-US level=3 l10n=NEWAssigned start parameters/paragraph -paragraph role=paragraph id=par_idN10590 xml-lang=en-US l10n=NEWahelp hid
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk|1
cui/source/inc/helpid.hrc |1
cui/source/options/optjava.cxx | 95 ++-
cui/source/options/optjava.hrc | 14 --
cui/source/options/optjava.hxx | 20 +--
cui/source/options/optjava.src | 68 --
cui/uiconfig/ui/javaclasspathdialog.ui | 208 +
7 files changed, 260 insertions(+), 147 deletions(-)
New commits:
commit e10667a4c6f61286dfed8c0ae2e88893b032a6a0
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Mon Sep 2 07:53:18 2013 +0300
Convert java class path dialog to .ui
Change-Id: I358651b9104b1fd274e70c090d5d16215cd9fd10
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 7e46543..9dbb240 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/insertoleobject \
cui/uiconfig/ui/insertplugin \
cui/uiconfig/ui/insertrowcolumn \
+ cui/uiconfig/ui/javaclasspathdialog \
cui/uiconfig/ui/linedialog \
cui/uiconfig/ui/linetabpage \
cui/uiconfig/ui/lineendstabpage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 450a8be..ad6b45c 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -34,7 +34,6 @@
#define HID_EDIT_MODULES CUI_HID_EDIT_MODULES
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
#define HID_OPTIONS_JAVA_PARAMETER CUI_HID_OPTIONS_JAVA_PARAMETER
-#define HID_OPTIONS_JAVA_CLASSPATH CUI_HID_OPTIONS_JAVA_CLASSPATH
#define HID_OFADLG_OPTIONS_TREE CUI_HID_OFADLG_OPTIONS_TREE
#define HID_OFA_CONNPOOL_DRIVERLIST CUI_HID_OFA_CONNPOOL_DRIVERLIST
#define UID_OFA_CONNPOOL_DRIVERLIST_BACK CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index ea8c391..aa1837c 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -921,61 +921,54 @@ void SvxJavaParameterDlg::SetParameters( Sequence
OUString rParams )
SvxJavaClassPathDlg::SvxJavaClassPathDlg( Window* pParent ) :
-ModalDialog( pParent, CUI_RES( RID_SVXDLG_JAVA_CLASSPATH ) ),
-
-m_aPathLabel( this, CUI_RES( FT_PATH ) ),
-m_aPathList ( this, CUI_RES( LB_PATH ) ),
-m_aAddArchiveBtn( this, CUI_RES( PB_ADDARCHIVE ) ),
-m_aAddPathBtn ( this, CUI_RES( PB_ADDPATH ) ),
-m_aRemoveBtn( this, CUI_RES( PB_REMOVE_PATH ) ),
-m_aButtonsLine ( this, CUI_RES( FL_PATH_BUTTONS ) ),
-m_aOKBtn( this, CUI_RES( PB_PATH_OK ) ),
-m_aCancelBtn( this, CUI_RES( PB_PATH_ESC ) ),
-m_aHelpBtn ( this, CUI_RES( PB_PATH_HLP ) )
-
+ModalDialog( pParent, JavaClassPath, cui/ui/javaclasspathdialog.ui )
{
-FreeResource();
-m_aAddArchiveBtn.SetClickHdl( LINK( this, SvxJavaClassPathDlg,
AddArchiveHdl_Impl ) );
-m_aAddPathBtn.SetClickHdl( LINK( this, SvxJavaClassPathDlg,
AddPathHdl_Impl ) );
-m_aRemoveBtn.SetClickHdl( LINK( this, SvxJavaClassPathDlg, RemoveHdl_Impl
) );
-m_aPathList.SetSelectHdl( LINK( this, SvxJavaClassPathDlg, SelectHdl_Impl
) );
+get( m_pPathList, paths);
+get( m_pAddArchiveBtn, archive);
+get( m_pAddPathBtn, folder);
+get( m_pRemoveBtn, remove);
+
+m_pAddArchiveBtn-SetClickHdl( LINK( this, SvxJavaClassPathDlg,
AddArchiveHdl_Impl ) );
+m_pAddPathBtn-SetClickHdl( LINK( this, SvxJavaClassPathDlg,
AddPathHdl_Impl ) );
+m_pRemoveBtn-SetClickHdl( LINK( this, SvxJavaClassPathDlg, RemoveHdl_Impl
) );
+m_pPathList-SetSelectHdl( LINK( this, SvxJavaClassPathDlg, SelectHdl_Impl
) );
// check if the buttons text are not too wide otherwise we have to stretch
the buttons
// and shrink the listbox
-long nTxtWidth1 = m_aAddArchiveBtn.GetTextWidth(
m_aAddArchiveBtn.GetText() );
-long nTxtWidth2 = m_aAddPathBtn.GetTextWidth( m_aAddPathBtn.GetText() );
-Size aBtnSz = m_aAddArchiveBtn.GetSizePixel();
+long nTxtWidth1 = m_pAddArchiveBtn-GetTextWidth(
m_pAddArchiveBtn-GetText() );
+long nTxtWidth2 = m_pAddPathBtn-GetTextWidth( m_pAddPathBtn-GetText() );
+Size aBtnSz = m_pAddArchiveBtn-GetSizePixel();
if ( nTxtWidth1 aBtnSz.Width() || nTxtWidth2 aBtnSz.Width() )
{
long nW = ( nTxtWidth1 aBtnSz.Width() ) ? nTxtWidth1 : nTxtWidth2;
long nDelta = nW - aBtnSz.Width() + 2 * BUTTON_BORDER;
aBtnSz.Width() += nDelta;
-Point aBtnPnt = m_aAddArchiveBtn.GetPosPixel();
+Point aBtnPnt = m_pAddArchiveBtn-GetPosPixel();
aBtnPnt.X() -= nDelta;
-m_aAddArchiveBtn.SetPosSizePixel( aBtnPnt, aBtnSz );
-aBtnPnt = m_aAddPathBtn.GetPosPixel();
+m_pAddArchiveBtn-SetPosSizePixel( aBtnPnt, aBtnSz );
+aBtnPnt = m_pAddPathBtn-GetPosPixel();
aBtnPnt.X() -= nDelta;
-m_aAddPathBtn.SetPosSizePixel( aBtnPnt, aBtnSz
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |5 - source/text/shared/optionen/javaclasspath.xhp | 14 +++--- 2 files changed, 7 insertions(+), 12 deletions(-) New commits: commit 52913ade5f7e6b163e09bc4f7289451f72db019e Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Mon Sep 2 11:39:36 2013 +0300 update help ids for java class path dialog diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index def7b61..1ffae3e 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2593,7 +2593,6 @@ HID_OPTIONS_COLORCONFIG_NAME_SCHEME,39875, HID_OPTIONS_DICT_EDIT,33815, HID_OPTIONS_DICT_EDIT_ENTRIES_LIST,39896, HID_OPTIONS_DICT_NEW,33814, -HID_OPTIONS_JAVA_CLASSPATH,3, HID_OPTIONS_JAVA_PARAMETER,39998, HID_OPTIONS_LINGU,33812, HID_OPTIONS_MULTIPATH_LIST,40056, @@ -6896,7 +6895,6 @@ svx_ListBox_RID_SVXDLG_BMPMASK_LB_TRANS,3391950341, svx_ListBox_RID_SVXDLG_EDIT_MODULES_LB_EDIT_MODULES_LANGUAGE,1251200831, svx_ListBox_RID_SVXDLG_FONTWORK_CLB_SHADOW_COLOR,3386592769, svx_ListBox_RID_SVXDLG_GALLERY_THEMEID_LB_RESNAME,1243631105, -svx_ListBox_RID_SVXDLG_JAVA_CLASSPATH_LB_PATH,1241763339, svx_ListBox_RID_SVXDLG_JAVA_PARAMETER_LB_ASSIGNED,1241746965, svx_ListBox_RID_SVXDLG_MULTIPATH_LB_MULTIPATH,1240878603, svx_ListBox_RID_SVXDLG_RUBY_LB_ADJUST,2315374103, @@ -7134,9 +7132,6 @@ svx_PushButton_RID_SVXDLG_BMPMASK_BTN_EXEC,3391951361, svx_PushButton_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_BACK,1251201847, svx_PushButton_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_DOWN,1251201846, svx_PushButton_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_UP,1251201845, -svx_PushButton_RID_SVXDLG_JAVA_CLASSPATH_PB_ADDARCHIVE,1241764372, -svx_PushButton_RID_SVXDLG_JAVA_CLASSPATH_PB_ADDPATH,1241764373, -svx_PushButton_RID_SVXDLG_JAVA_CLASSPATH_PB_REMOVE_PATH,1241764374, svx_PushButton_RID_SVXDLG_JAVA_PARAMETER_PB_ASSIGN,1241747980, svx_PushButton_RID_SVXDLG_JAVA_PARAMETER_PB_REMOVE,1241747991, svx_PushButton_RID_SVXDLG_MULTIPATH_BTN_ADD_MULTIPATH,1240879630, diff --git a/source/text/shared/optionen/javaclasspath.xhp b/source/text/shared/optionen/javaclasspath.xhp index c872584..6719472 100644 --- a/source/text/shared/optionen/javaclasspath.xhp +++ b/source/text/shared/optionen/javaclasspath.xhp @@ -37,18 +37,18 @@ embed href=text/shared/00/0406.xhp#advanced/ /section !-- removed HID SVX_EDIT_RID_SVXPAGE_INET_SCRIPTING_ED_CLASSPATH -- -bookmark xml-lang=en-US branch=hid/cui:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH id=bm_id6794640 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/javaclasspath/paths id=bm_id6794640 localize=false/ paragraph role=heading id=par_idN10589 xml-lang=en-US level=2 l10n=NEWAssigned folders and archives/paragraph paragraph role=paragraph id=par_idN1059F xml-lang=en-US l10n=NEWahelp hid=SVX_EDIT_RID_SVXPAGE_INET_SCRIPTING_ED_CLASSPATHSpecifies the location of Java classes or Java class libraries./ahelp The new classpath becomes valid after you restart item type=productname%PRODUCTNAME/item.commentUFI: moved these paras here from the Security tab page/comment/paragraph paragraph role=warning id=par_idN105D9 xml-lang=en-US l10n=NEWJava classes that are accessed through the classpath do not undergo a security check.commentUFI: moved these paras here from the Security tab page/comment/paragraph -bookmark xml-lang=en-US branch=hid/cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE id=bm_id5538804 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/javaclasspath/archive id=bm_id5538804 localize=false/ paragraph role=heading id=par_idN1060A xml-lang=en-US level=3 l10n=NEWAdd Archive/paragraph -paragraph role=paragraph id=par_idN1060E xml-lang=en-US l10n=NEWahelp hid=svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVESelect an archive file in jar or zip format and add the file to the class path./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH id=bm_id3354899 localize=false/ +paragraph role=paragraph id=par_idN1060E xml-lang=en-US l10n=NEWahelp hid=cui/ui/javaclasspath/archiveSelect an archive file in jar or zip format and add the file to the class path./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/javaclasspath/folder id=bm_id3354899 localize=false/ paragraph role=heading id=par_idN10625 xml-lang=en-US level=3 l10n=NEWAdd Folder/paragraph -paragraph role=paragraph id=par_idN10629 xml-lang=en-US l10n=NEWahelp hid=svx:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATHSelect a folder and add the folder to the class path./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH id=bm_id1084017 localize=false/ +paragraph role=paragraph id=par_idN10629 xml-lang=en-US l10n=NEWahelp hid=cui/ui/javaclasspath/folderSelect a folder and add the folder to the class path./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/javaclasspath/remove id=bm_id1084017 localize
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5997ba90640a723123b50a909f306008ea550b17 Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Mon Sep 2 11:39:36 2013 +0300 Updated core Project: help 52913ade5f7e6b163e09bc4f7289451f72db019e diff --git a/helpcontent2 b/helpcontent2 index be97fb3..52913ad 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit be97fb306d6baefa28ee840b0907142ed72af3e5 +Subproject commit 52913ade5f7e6b163e09bc4f7289451f72db019e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1
cui/source/inc/cuires.hrc|6
cui/source/inc/helpid.hrc|1
cui/source/options/optlingu.cxx | 45 +--
cui/source/options/optlingu.hrc |8 -
cui/source/options/optlingu.src | 62 +
cui/uiconfig/ui/breaknumberoption.ui | 221 +++
7 files changed, 270 insertions(+), 74 deletions(-)
New commits:
commit 943c60e5efe8c2eba5581a085d237bdaf4d00bc8
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Thu Aug 29 11:46:03 2013 +0300
Convert Hyphenation dialogs to .ui
Change-Id: I086a99c391185cb213ad63a66a954f8e66f8fc9e
Reviewed-on: https://gerrit.libreoffice.org/5672
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index a0d790c..7e46543 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/backgroundpage \
cui/uiconfig/ui/bitmaptabpage \
cui/uiconfig/ui/borderpage \
+ cui/uiconfig/ui/breaknumberoption \
cui/uiconfig/ui/cellalignment \
cui/uiconfig/ui/charnamepage \
cui/uiconfig/ui/colorpage \
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index abf3728..e8960ba 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -161,7 +161,6 @@
#define RID_SVXDLG_JAVA_CLASSPATH (RID_SVX_START + 255)
#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256)
#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257)
-#define RID_SVXDLG_LNG_ED_NUM_PREBREAK (RID_SVX_START + 830)
#define RID_SVXDLG_EDIT_MODULES (RID_SVX_START + 831)
#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003)
#define RID_SVXBMP_LOCK (RID_SVX_START + 118)
@@ -423,6 +422,11 @@
#define RID_SVXSTR_DEL_SPACES_AT_STT_END(RID_SVX_START +
1223)
#define RID_SVXSTR_DEL_SPACES_BETWEEN_LINES (RID_SVX_START +
1224)
+// from optlingu.src
+#define STR_NUM_PRE_BREAK_DLG (RID_SVX_START +
1225)
+#define STR_NUM_POST_BREAK_DLG (RID_SVX_START +
1226)
+#define STR_NUM_MIN_WORDLEN_DLG (RID_SVX_START +
1227)
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 8354935..450a8be 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -32,7 +32,6 @@
#define HID_CLB_LINGU_MODULES CUI_HID_CLB_LINGU_MODULES
#define HID_CLB_LINGU_OPTIONS CUI_HID_CLB_LINGU_OPTIONS
#define HID_EDIT_MODULES CUI_HID_EDIT_MODULES
-#define HID_LNGDLG_NUM_PREBREAK CUI_HID_LNGDLG_NUM_PREBREAK
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
#define HID_OPTIONS_JAVA_PARAMETER CUI_HID_OPTIONS_JAVA_PARAMETER
#define HID_OPTIONS_JAVA_CLASSPATH CUI_HID_OPTIONS_JAVA_CLASSPATH
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 3a497f5..d771d29 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -308,29 +308,48 @@ void BrwStringDic_Impl::Paint(
class OptionsBreakSet : public ModalDialog
{
-OKButtonaOKPB;
-CancelButtonaCancelPB;
-FixedLine aValFL;
-NumericFieldaValNF;
+VclFrame* m_pBeforeFrame;
+VclFrame* m_pAfterFrame;
+VclFrame* m_pMinimalFrame;
+NumericField* m_pBreakNF;
public:
OptionsBreakSet(Window* pParent, int nRID) :
-ModalDialog(pParent, CUI_RES(RID_SVXDLG_LNG_ED_NUM_PREBREAK )),
-aOKPB (this, CUI_RES(BT_OK_PREBREAK)),
-aCancelPB (this, CUI_RES(BT_CANCEL_PREBREAK)),
-aValFL (this, CUI_RES(FL_NUMVAL_PREBREAK)),
-aValNF (this, CUI_RES(ED_PREBREAK))
+ModalDialog(pParent, BreakNumberOption,
cui/ui/breaknumberoption.ui)
{
+get( m_pBeforeFrame, beforeframe);
+get( m_pAfterFrame, afterframe);
+get( m_pMinimalFrame, miniframe);
+get( m_pBreakNF, breaknumber);
+
DBG_ASSERT( STR_NUM_PRE_BREAK_DLG == nRID ||
STR_NUM_POST_BREAK_DLG == nRID ||
STR_NUM_MIN_WORDLEN_DLG == nRID, unexpected RID );
-if (nRID != -1)
-aValFL.SetText( String( CUI_RES(nRID) ) );
-FreeResource();
+if ( nRID != -1 )
+{
+if( nRID == STR_NUM_PRE_BREAK_DLG )
+{
+m_pAfterFrame -Hide();
+m_pMinimalFrame-Hide();
+}
+if( nRID == STR_NUM_POST_BREAK_DLG )
+{
+m_pBeforeFrame -Hide();
+m_pMinimalFrame-Hide();
+}
+if( nRID
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/optmemorypage.ui |6 -- 1 file changed, 6 deletions(-) New commits: commit 93be66f98f3180cbbe358bb5b38f64852a0d30fc Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Tue Aug 27 08:20:54 2013 +0300 fix uneditable field in memory option page this will fix an uneditable remove from memory after field Change-Id: I0b47c4b8082d3244186596a7127f059bbb7214a5 Reviewed-on: https://gerrit.libreoffice.org/5640 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui index c705854..a7dad6b 100644 --- a/cui/uiconfig/ui/optmemorypage.ui +++ b/cui/uiconfig/ui/optmemorypage.ui @@ -22,11 +22,6 @@ property name=step_increment1/property property name=page_increment10/property /object - object class=GtkAdjustment id=adjustment4 -property name=lower1/property -property name=upper2359/property -property name=value10/property - /object object class=GtkBox id=OptMemoryPage property name=visibleTrue/property property name=can_focusFalse/property @@ -229,7 +224,6 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=invisible_charâ¢/property -property name=adjustmentadjustment4/property /object packing property name=left_attach1/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig
cui/uiconfig/ui/optmemorypage.ui |6 -- 1 file changed, 6 deletions(-) New commits: commit 751b65b246f9adaad314af808940e31050edc642 Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Tue Aug 27 08:20:54 2013 +0300 fix uneditable field in memory option page this will fix an uneditable remove from memory after field Change-Id: I0b47c4b8082d3244186596a7127f059bbb7214a5 Reviewed-on: https://gerrit.libreoffice.org/5640 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit 93be66f98f3180cbbe358bb5b38f64852a0d30fc) Reviewed-on: https://gerrit.libreoffice.org/5642 Reviewed-by: Jan Holesovsky ke...@suse.cz Tested-by: Jan Holesovsky ke...@suse.cz diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui index d8c91b7..2e5a2d8 100644 --- a/cui/uiconfig/ui/optmemorypage.ui +++ b/cui/uiconfig/ui/optmemorypage.ui @@ -22,11 +22,6 @@ property name=step_increment1/property property name=page_increment10/property /object - object class=GtkAdjustment id=adjustment4 -property name=lower1/property -property name=upper2359/property -property name=value10/property - /object object class=GtkBox id=OptMemoryPage property name=visibleTrue/property property name=can_focusFalse/property @@ -229,7 +224,6 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=invisible_charâ¢/property -property name=adjustmentadjustment4/property /object packing property name=left_attach1/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1
cui/source/dialogs/srchxtra.cxx | 31 +--
cui/source/dialogs/srchxtra.hrc |9 -
cui/source/dialogs/srchxtra.src | 108
cui/source/inc/cuires.hrc |3
cui/source/inc/srchxtra.hxx | 24 --
cui/uiconfig/ui/similaritysearchdialog.ui | 257 ++
7 files changed, 276 insertions(+), 157 deletions(-)
New commits:
commit 68e793d36dbdcae8d9eb77ef0b37c9daba49075d
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Mon Aug 19 13:26:52 2013 +0300
Convert similarity search dialog to .ui
Conflicts:
cui/UIConfig_cui.mk
Change-Id: Ia628babd27ca29769a6a287f70367d8208c5cc59
Reviewed-on: https://gerrit.libreoffice.org/5510
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 4e52967..9435977 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -104,6 +104,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/securityoptionsdialog \
cui/uiconfig/ui/select_persona_dialog \
cui/uiconfig/ui/shadowtabpage \
+ cui/uiconfig/ui/similaritysearchdialog \
cui/uiconfig/ui/slantcornertabpage \
cui/uiconfig/ui/specialcharacters \
cui/uiconfig/ui/spellingdialog \
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 4a6f443..bbe94bc 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -248,28 +248,17 @@ SvxSearchSimilarityDialog::SvxSearchSimilarityDialog
sal_uInt16 nShorter,
sal_uInt16 nLonger
) :
-ModalDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHSIMILARITY ) ),
-
-aFixedLine ( this, CUI_RES( FL_SIMILARITY ) ),
-aOtherTxt ( this, CUI_RES( FT_OTHER ) ),
-aOtherFld ( this, CUI_RES( NF_OTHER ) ),
-aLongerTxt ( this, CUI_RES( FT_LONGER ) ),
-aLongerFld ( this, CUI_RES( NF_LONGER ) ),
-aShorterTxt ( this, CUI_RES( FT_SHORTER ) ),
-aShorterFld ( this, CUI_RES( NF_SHORTER ) ),
-aRelaxBox ( this, CUI_RES( CB_RELAX ) ),
-
-aOKBtn ( this, CUI_RES( BTN_ATTR_OK ) ),
-aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ),
-aHelpBtn( this, CUI_RES( BTN_ATTR_HELP ) )
-
+ModalDialog( pParent, SimilaritySearchDialog,
cui/ui/similaritysearchdialog.ui )
{
-FreeResource();
-
-aOtherFld.SetValue( nOther );
-aShorterFld.SetValue( nShorter );
-aLongerFld.SetValue( nLonger );
-aRelaxBox.Check( bRelax );
+get( m_pOtherFld, otherfld);
+get( m_pLongerFld, longerfld);
+get( m_pShorterFld, shorterfld);
+get( m_pRelaxBox, relaxbox);
+
+m_pOtherFld-SetValue( nOther );
+m_pShorterFld-SetValue( nShorter );
+m_pLongerFld-SetValue( nLonger );
+m_pRelaxBox-Check( bRelax );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/srchxtra.hrc b/cui/source/dialogs/srchxtra.hrc
index ced02f3..6bfe114 100644
--- a/cui/source/dialogs/srchxtra.hrc
+++ b/cui/source/dialogs/srchxtra.hrc
@@ -27,15 +27,6 @@
#define LB_ATTR 13
#define FL_ATTR 14
-#define CB_RELAX15
-#define FT_OTHER16
-#define NF_OTHER17
-#define FT_SHORTER 18
-#define NF_SHORTER 19
-#define FT_LONGER 20
-#define NF_LONGER 21
-#define FL_SIMILARITY 22
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/srchxtra.src b/cui/source/dialogs/srchxtra.src
index 9c10335..ec032f7 100644
--- a/cui/source/dialogs/srchxtra.src
+++ b/cui/source/dialogs/srchxtra.src
@@ -123,114 +123,6 @@ ModalDialog RID_SVXDLG_SEARCHATTR
Size = MAP_APPFONT ( 50 , 14 ) ;
};
};
- // RID_SVXDLG_SEARCHSIMILARITY ---
-ModalDialog RID_SVXDLG_SEARCHSIMILARITY
-{
-HelpId = HID_SEARCHSIMILARITY ;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 178 , 76 ) ;
-Text [ en-US ] = Similarity Search ;
-Moveable = TRUE ;
-FixedText FT_OTHER
-{
-Pos = MAP_APPFONT ( 12 , 16 ) ;
-Size = MAP_APPFONT ( 70 , 8 ) ;
-Text [ en-US ] = ~Exchange characters ;
-};
-NumericField NF_OTHER
-{
-HelpID = cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER;
-Pos = MAP_APPFONT ( 86 , 14 ) ;
-Size = MAP_APPFONT ( 24 , 12 ) ;
-Border = TRUE ;
-Left = TRUE ;
-Repeat = TRUE ;
-Spin = TRUE ;
-Minimum = 0 ;
-First = 1 ;
-Maximum = 30 ;
-Last = 30 ;
-Value = 1 ;
-TabStop = TRUE ;
-};
-FixedText FT_LONGER
-{
-Pos = MAP_APPFONT ( 12 , 30 ) ;
-Size = MAP_APPFONT ( 70 , 8 ) ;
-Text [ en-US ] = ~Add characters ;
-};
-NumericField NF_LONGER
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - sd/source
sd/source/ui/view/drtxtob1.cxx | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 24135caf7f8ac668023bb4473fd0a463d027c96c
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Fri Jun 28 10:54:55 2013 +0200
fix crash when use increase font on table in impress
Change-Id: Id6c8cac4543d97657cb66b979f5dc4b5f903473a
Reviewed-on: https://gerrit.libreoffice.org/4797
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-on: https://gerrit.libreoffice.org/5030
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 572fbed..6ad4cf1 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -328,15 +328,17 @@ void TextObjectBar::Execute( SfxRequest rReq )
if( pFontList )
{
FuText::ChangeFontSize( nSlot == SID_GROW_FONT_SIZE, pOLV,
pFontList, mpView );
+if( pOLV )
+{
+SfxItemSet aSet( pOLV-GetEditView().GetAttribs() );
+SfxItemSet aNewAttrs
(pOLV-GetEditView().GetEmptyItemSet() );
-SfxItemSet aSet( pOLV-GetEditView().GetAttribs() );
-SfxItemSet aNewAttrs (pOLV-GetEditView().GetEmptyItemSet() );
-
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ),
EE_CHAR_FONTHEIGHT );
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ),
EE_CHAR_FONTHEIGHT_CJK );
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ),
EE_CHAR_FONTHEIGHT_CTL );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ),
EE_CHAR_FONTHEIGHT );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ),
EE_CHAR_FONTHEIGHT_CJK );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ),
EE_CHAR_FONTHEIGHT_CTL );
-mpView-SetAttributes( aNewAttrs );
+mpView-SetAttributes( aNewAttrs );
+}
Invalidate();
// to refresh preview (in outline mode), slot has to be
invalidated:
mpViewShell-GetViewFrame()-GetBindings().Invalidate(
SID_PREVIEW_STATE, sal_True, sal_False );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sd/source
sd/source/ui/view/drtxtob1.cxx | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
New commits:
commit b41378eae135982acdc910af3ff9987348f00fba
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Fri Jun 28 10:54:55 2013 +0200
fix crash when use increase font on table in impress
Change-Id: Id6c8cac4543d97657cb66b979f5dc4b5f903473a
Reviewed-on: https://gerrit.libreoffice.org/4797
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 572fbed..6ad4cf1 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -328,15 +328,17 @@ void TextObjectBar::Execute( SfxRequest rReq )
if( pFontList )
{
FuText::ChangeFontSize( nSlot == SID_GROW_FONT_SIZE, pOLV,
pFontList, mpView );
+if( pOLV )
+{
+SfxItemSet aSet( pOLV-GetEditView().GetAttribs() );
+SfxItemSet aNewAttrs
(pOLV-GetEditView().GetEmptyItemSet() );
-SfxItemSet aSet( pOLV-GetEditView().GetAttribs() );
-SfxItemSet aNewAttrs (pOLV-GetEditView().GetEmptyItemSet() );
-
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ),
EE_CHAR_FONTHEIGHT );
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ),
EE_CHAR_FONTHEIGHT_CJK );
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ),
EE_CHAR_FONTHEIGHT_CTL );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ),
EE_CHAR_FONTHEIGHT );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ),
EE_CHAR_FONTHEIGHT_CJK );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ),
EE_CHAR_FONTHEIGHT_CTL );
-mpView-SetAttributes( aNewAttrs );
+mpView-SetAttributes( aNewAttrs );
+}
Invalidate();
// to refresh preview (in outline mode), slot has to be
invalidated:
mpViewShell-GetViewFrame()-GetBindings().Invalidate(
SID_PREVIEW_STATE, sal_True, sal_False );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/drtxtob1.cxx | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 335891b6b20a90734e2af8bddf9ba535cc3a8e93
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Fri Jun 28 10:54:55 2013 +0200
fix crash when use increase font on table in impress
Change-Id: Id6c8cac4543d97657cb66b979f5dc4b5f903473a
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 572fbed..6ad4cf1 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -328,15 +328,17 @@ void TextObjectBar::Execute( SfxRequest rReq )
if( pFontList )
{
FuText::ChangeFontSize( nSlot == SID_GROW_FONT_SIZE, pOLV,
pFontList, mpView );
+if( pOLV )
+{
+SfxItemSet aSet( pOLV-GetEditView().GetAttribs() );
+SfxItemSet aNewAttrs
(pOLV-GetEditView().GetEmptyItemSet() );
-SfxItemSet aSet( pOLV-GetEditView().GetAttribs() );
-SfxItemSet aNewAttrs (pOLV-GetEditView().GetEmptyItemSet() );
-
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ),
EE_CHAR_FONTHEIGHT );
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ),
EE_CHAR_FONTHEIGHT_CJK );
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ),
EE_CHAR_FONTHEIGHT_CTL );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ),
EE_CHAR_FONTHEIGHT );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ),
EE_CHAR_FONTHEIGHT_CJK );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ),
EE_CHAR_FONTHEIGHT_CTL );
-mpView-SetAttributes( aNewAttrs );
+mpView-SetAttributes( aNewAttrs );
+}
Invalidate();
// to refresh preview (in outline mode), slot has to be
invalidated:
mpViewShell-GetViewFrame()-GetBindings().Invalidate(
SID_PREVIEW_STATE, sal_True, sal_False );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/builder.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b2d9ebf1b95867f7df335b74f3e3c5328647f34a
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Tue Jun 25 12:36:01 2013 +0200
add safety check for '_' if had been put in the end of the text
Change-Id: I7fae615f644158c9e5137330daa4873ad4192fd5
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index e79896e..4cc571f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2201,7 +2201,7 @@ OString VclBuilder::convertMnemonicMarkup(const OString
rIn)
OStringBuffer aRet(rIn);
for (sal_Int32 nI = 0; nI aRet.getLength(); ++nI)
{
-if (aRet[nI] == '_')
+if (aRet[nI] == '_' nI+1 aRet.getLength())
{
if (aRet[nI+1] != '_')
aRet[nI] = MNEMONIC_CHAR;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig starmath/UIConfig_smath.mk
starmath/UIConfig_smath.mk |1
starmath/inc/dialog.hxx | 21 --
starmath/inc/starmath.hrc |1
starmath/source/dialog.cxx | 72 +++---
starmath/source/dialog.hrc | 16 -
starmath/source/smres.src | 105 --
starmath/uiconfig/smath/ui/smathsettings.ui | 290
7 files changed, 334 insertions(+), 172 deletions(-)
New commits:
commit 4f99d56f929c1eac07217e0f80a501b4e3dbdc6c
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Tue Jun 18 14:26:00 2013 +0200
convert starmath settings option page to .ui format
Change-Id: I908a29713ca1e01ec3e742193bd4b49e1fa97bc9
diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
index d64abe8..2f26333 100644
--- a/starmath/UIConfig_smath.mk
+++ b/starmath/UIConfig_smath.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
starmath/uiconfig/smath/ui/catalogdialog \
starmath/uiconfig/smath/ui/printeroptions \
starmath/uiconfig/smath/ui/savedefaultsdialog \
+ starmath/uiconfig/smath/ui/smathsettings \
starmath/uiconfig/smath/ui/spacingdialog \
))
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index ca902b5..6c3586e 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -51,18 +51,15 @@ void SetFontStyle(const OUString rStyleName, Font rFont);
class SmPrintOptionsTabPage : public SfxTabPage
{
-FixedLine aFixedLine1;
-CheckBoxaTitle;
-CheckBoxaText;
-CheckBoxaFrame;
-FixedLine aFixedLine2;
-RadioButton aSizeNormal;
-RadioButton aSizeScaled;
-RadioButton aSizeZoomed;
-MetricField aZoom;
-FixedLine aFixedLine3;
-CheckBoxaNoRightSpaces;
-CheckBoxaSaveOnlyUsedSymbols;
+CheckBox* m_pTitle;
+CheckBox* m_pText;
+CheckBox* m_pFrame;
+RadioButton*m_pSizeNormal;
+RadioButton*m_pSizeScaled;
+RadioButton*m_pSizeZoomed;
+MetricField*m_pZoom;
+CheckBox* m_pNoRightSpaces;
+CheckBox* m_pSaveOnlyUsedSymbols;
DECL_LINK(SizeButtonClickHdl, Button *);
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index f03cd6d..dedc3f3 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -79,7 +79,6 @@
#define RID_FONTDIALOG (RID_APP_START + 2)
#define RID_FONTSIZEDIALOG (RID_APP_START + 3)
#define RID_FONTTYPEDIALOG (RID_APP_START + 4)
-#define RID_PRINTOPTIONPAGE (RID_APP_START + 7)
#define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
#define RID_PRINTUIOPTIONS (RID_APP_START + 11)
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 86e2340..67c4a1d 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -152,32 +152,28 @@ void SetFontStyle(const OUString rStyleName, Font rFont)
IMPL_LINK_INLINE_START( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *,
EMPTYARG/*pButton*/ )
{
-aZoom.Enable(aSizeZoomed.IsChecked());
+m_pZoom-Enable(m_pSizeZoomed-IsChecked());
return 0;
}
IMPL_LINK_INLINE_END( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *,
pButton )
SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet
rOptions)
-: SfxTabPage(pParent, SmResId(RID_PRINTOPTIONPAGE), rOptions),
-aFixedLine1 (this, SmResId( FL_PRINTOPTIONS )),
-aTitle (this, SmResId( CB_TITLEROW )),
-aText (this, SmResId( CB_EQUATION_TEXT )),
-aFrame (this, SmResId( CB_FRAME )),
-aFixedLine2 (this, SmResId( FL_PRINT_FORMAT )),
-aSizeNormal (this, SmResId( RB_ORIGINAL_SIZE )),
-aSizeScaled (this, SmResId( RB_FIT_TO_PAGE )),
-aSizeZoomed (this, SmResId( RB_ZOOM )),
-aZoom (this, SmResId( MF_ZOOM )),
-aFixedLine3 (this, SmResId( FL_MISC_OPTIONS )),
-aNoRightSpaces (this, SmResId( CB_IGNORE_SPACING )),
-aSaveOnlyUsedSymbols (this, SmResId( CB_SAVE_ONLY_USED_SYMBOLS ))
-{
-FreeResource();
-
-aSizeNormal.SetClickHdl(LINK(this, SmPrintOptionsTabPage,
SizeButtonClickHdl));
-aSizeScaled.SetClickHdl(LINK(this, SmPrintOptionsTabPage,
SizeButtonClickHdl));
-aSizeZoomed.SetClickHdl(LINK(this, SmPrintOptionsTabPage,
SizeButtonClickHdl));
+: SfxTabPage(pParent, SmathSettings,
modules/smath/ui/smathsettings.ui, rOptions)
+{
+get( m_pTitle, title);
+get( m_pText,text);
+get( m_pFrame, frame);
+get( m_pSizeNormal, sizenormal);
+get( m_pSizeScaled, sizescaled);
+get( m_pSizeZoomed, sizezoomed);
+get( m_pZoom,zoom);
+get( m_pNoRightSpaces, norightspaces);
+get( m_pSaveOnlyUsedSymbols, saveonlyusedsymbols
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |9 - source/text/shared/optionen/01090100.xhp | 30 +++--- 2 files changed, 15 insertions(+), 24 deletions(-) New commits: commit 69604ab9ca7ce8f03c5eced18c39308e1ca0 Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Tue Jun 18 15:19:44 2013 +0200 update help ids for starmath settings option page .ui conversion diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 45b64de..8923027 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6997,10 +6997,6 @@ sfx2_PushButton_TP_HELP_SEARCH_PB_OPEN_SEARCH,547000849, sfx2_PushButton_TP_HELP_SEARCH_PB_SEARCH,547000844, starmath_CheckBox_RID_FONTDIALOG_1,1401455617, starmath_CheckBox_RID_FONTDIALOG_2,1401455618, -starmath_CheckBox_RID_PRINTOPTIONPAGE_CB_EQUATION_TEXT,86436, -starmath_CheckBox_RID_PRINTOPTIONPAGE_CB_FRAME,86437, -starmath_CheckBox_RID_PRINTOPTIONPAGE_CB_IGNORE_SPACING,86455, -starmath_CheckBox_RID_PRINTOPTIONPAGE_CB_TITLEROW,86435, starmath_ComboBox_RID_FONTDIALOG_1,1401458689, starmath_ComboBox_RID_SYMDEFINEDIALOG_1,1401573377, starmath_ComboBox_RID_SYMDEFINEDIALOG_2,1401573378, @@ -7023,7 +7019,6 @@ starmath_MetricField_RID_FONTSIZEDIALOG_5,1401477637, starmath_MetricField_RID_FONTSIZEDIALOG_6,1401477638, starmath_MetricField_RID_FONTSIZEDIALOG_7,1401477639, starmath_MetricField_RID_FONTSIZEDIALOG_8,1401477640, -starmath_MetricField_RID_PRINTOPTIONPAGE_MF_ZOOM,864672280, starmath_ModalDialog_RID_FONTDIALOG,1401454592, starmath_ModalDialog_RID_SYMDEFINEDIALOG,1401569280, starmath_PushButton_RID_FONTSIZEDIALOG_1,1401475585, @@ -7031,10 +7026,6 @@ starmath_PushButton_RID_FONTTYPEDIALOG_2,1401491970, starmath_PushButton_RID_SYMDEFINEDIALOG_1,1401573889, starmath_PushButton_RID_SYMDEFINEDIALOG_2,1401573890, starmath_PushButton_RID_SYMDEFINEDIALOG_3,1401573891, -starmath_RadioButton_RID_PRINTOPTIONPAGE_RB_FIT_TO_PAGE,864666134, -starmath_RadioButton_RID_PRINTOPTIONPAGE_RB_ORIGINAL_SIZE,864666133, -starmath_RadioButton_RID_PRINTOPTIONPAGE_RB_ZOOM,864666135, -starmath_TabPage_RID_PRINTOPTIONPAGE,864665600, svtools_CheckBox_DLG_LOGIN_CB_LOGIN_SAVEPASSWORD,1336427552, svtools_CheckBox_DLG_SVT_PRNDLG_PRINTDLG_CBX_COLLATE,1338786859, svtools_CheckBox_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT,1338786829, diff --git a/source/text/shared/optionen/01090100.xhp b/source/text/shared/optionen/01090100.xhp index 93ddcc6..8239dff 100644 --- a/source/text/shared/optionen/01090100.xhp +++ b/source/text/shared/optionen/01090100.xhp @@ -41,7 +41,7 @@ bookmark_valuescaling; printing in $[officename] Math/bookmark_value bookmark_valuefitting to pages;print settings in Math/bookmark_value /bookmarkcommentmw inserted fitting.../comment -bookmark xml-lang=en-US branch=hid/starmath:TabPage:RID_PRINTOPTIONPAGE id=bm_id3150178 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/smath/ui/smathsettings/SmathSettings id=bm_id3150178 localize=false/ bookmark xml-lang=en-US branch=hid/SFX2_HID_PRINT_OPTIONS id=bm_id3147226 localize=false/paragraph role=heading id=hd_id3150713 xml-lang=en-US level=1 l10n=U oldref=1Settings/paragraph paragraph role=paragraph id=par_id3145090 xml-lang=en-US l10n=U oldref=18variable id=einstahelp hid=HID_PRINT_OPTIONSDefines formula settings that will be valid for all documents./ahelp /variable/paragraph @@ -49,23 +49,23 @@ embed href=text/shared/00/0406.xhp#formeinst/ /section paragraph role=heading id=hd_id3159234 xml-lang=en-US level=2 l10n=U oldref=2Print options/paragraph -bookmark xml-lang=en-US branch=hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_TITLEROW id=bm_id3153528 localize=false/paragraph role=heading id=hd_id3156410 xml-lang=en-US level=3 l10n=U oldref=4Title/paragraph -paragraph role=paragraph id=par_id3156347 xml-lang=en-US l10n=U oldref=5ahelp hid=STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_TITLEROWSpecifies whether you want the name of the document to be included in the printout./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_EQUATION_TEXT id=bm_id3146798 localize=false/paragraph role=heading id=hd_id3166410 xml-lang=en-US level=3 l10n=U oldref=6Formula text/paragraph -paragraph role=paragraph id=par_id3155449 xml-lang=en-US l10n=U oldref=7ahelp hid=STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_EQUATION_TEXTSpecifies whether to include the contents of the emphCommands/emph window at the bottom of the printout./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_FRAME id=bm_id3154515 localize=false/paragraph role=heading id=hd_id3154046 xml-lang=en-US level=3 l10n=U oldref=8Border/paragraph +bookmark xml-lang=en-US branch=hid/modules/smath/ui/smathsettings/title id=bm_id3153528 localize=false/paragraph role=heading id=hd_id3156410 xml-lang=en-US level=3 l10n=U oldref=4Title/paragraph +paragraph role=paragraph id=par_id3156347 xml-lang=en-US l10n=U oldref=5ahelp
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d1556eefd9fd587a0bf2f7a42304654b00a376d9 Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa Date: Tue Jun 18 15:19:44 2013 +0200 Updated core Project: help 69604ab9ca7ce8f03c5eced18c39308e1ca0 diff --git a/helpcontent2 b/helpcontent2 index 383ad41..69604ab 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 383ad41f4c56b858362e44cdc3f795f4e11fdeae +Subproject commit 69604ab9ca7ce8f03c5eced18c39308e1ca0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/fdo43093.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 37 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 12 ++--
writerfilter/source/dmapper/DomainMapper.cxx | 23 +---
4 files changed, 65 insertions(+), 7 deletions(-)
New commits:
commit e9911f12d1e124d1910ac2310c224e66ab365ed4
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Sat Jun 15 12:55:14 2013 +0200
docx: fdo#43093 fdo#44029 fix the alignment when the paragraph are RTL
this will fix the alignment for RTL paragraph when import/export MS docx
file.
the alignment should be exchange when the paragraph are RTL.
it will also fix text direction export for RTL paragraph.
Change-Id: I5fe55205677d6e12142e398570cba78094705692
diff --git a/sw/qa/extras/ooxmlexport/data/fdo43093.docx
b/sw/qa/extras/ooxmlexport/data/fdo43093.docx
new file mode 100644
index 000..9d5de58
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo43093.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d6812f0..1cfc0ae 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -27,6 +27,7 @@
#include com/sun/star/awt/FontWeight.hpp
#include com/sun/star/awt/FontUnderline.hpp
#include com/sun/star/awt/FontSlant.hpp
+#include com/sun/star/text/WritingMode2.hpp
#include unotools/tempfile.hxx
#include unotools/ucbstreamhelper.hxx
@@ -79,6 +80,7 @@ public:
void testFdo65655();
void testFDO63053();
void testWatermark();
+void testFdo43093();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -133,6 +135,7 @@ void Test::run()
{fdo65655.docx, Test::testFdo65655},
{fdo63053.docx , Test::testFDO63053},
{watermark.docx, Test::testWatermark},
+{fdo43093.docx, Test::testFdo43093},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -771,6 +774,40 @@ void Test::testWatermark()
CPPUNIT_ASSERT_EQUAL(drawing::LineStyle_NONE,
getPropertydrawing::LineStyle(xShape, LineStyle));
}
+void Test::testFdo43093()
+{
+// The problem was that the alignment are not exchange when the paragraph
are RTL.
+uno::Referenceuno::XInterface xParaRtlLeft(getParagraph( 1, RTL Left));
+sal_Int32 nRtlLeft = getProperty sal_Int32 ( xParaRtlLeft, ParaAdjust
);
+// test the text Direction value for the pragraph
+sal_Int16 nRLDir = getProperty sal_Int32 ( xParaRtlLeft, WritingMode
);
+
+uno::Referenceuno::XInterface xParaRtlRight(getParagraph( 3, RTL
Right));
+sal_Int32 nRtlRight = getProperty sal_Int32 ( xParaRtlRight,
ParaAdjust );
+sal_Int16 nRRDir = getProperty sal_Int32 ( xParaRtlRight, WritingMode
);
+
+uno::Referenceuno::XInterface xParaLtrLeft(getParagraph( 5, LTR Left));
+sal_Int32 nLtrLeft = getProperty sal_Int32 ( xParaLtrLeft, ParaAdjust
);
+sal_Int16 nLLDir = getProperty sal_Int32 ( xParaLtrLeft, WritingMode
);
+
+uno::Referenceuno::XInterface xParaLtrRight(getParagraph( 7, LTR
Right));
+sal_Int32 nLtrRight = getProperty sal_Int32 ( xParaLtrRight,
ParaAdjust );
+sal_Int16 nLRDir = getProperty sal_Int32 ( xParaLtrRight, WritingMode
);
+
+// this will test the both the text direction and alignment for each
paragraph
+CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_LEFT), nRtlLeft);
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, nRLDir);
+
+CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_RIGHT), nRtlRight);
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, nRRDir);
+
+CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_LEFT), nLtrLeft);
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, nLLDir);
+
+CPPUNIT_ASSERT_EQUAL( sal_Int32 (style::ParagraphAdjust_RIGHT), nLtrRight);
+CPPUNIT_ASSERT_EQUAL(text::WritingMode2::LR_TB, nLRDir);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index d2049fc..254b0bf 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4261,7 +4261,10 @@ void DocxAttributeOutput::ParaAdjust( const
SvxAdjustItem rAdjust )
{
case SVX_ADJUST_LEFT:
if ( bEcma )
-pAdjustString = left;
+if ( bRtl )
+pAdjustString = right;
+else
+pAdjustString = left;
else if ( bRtl )
pAdjustString = end;
else
@@ -4269,7 +4272,10 @@ void DocxAttributeOutput::ParaAdjust( const
SvxAdjustItem rAdjust )
break;
case SVX_ADJUST_RIGHT:
if ( bEcma )
-pAdjustString = right
[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |1
sc/inc/helpids.h |1
sc/inc/sc.hrc |1
sc/source/ui/inc/optdlg.hrc | 21 -
sc/source/ui/inc/tpview.hxx | 37 +-
sc/source/ui/optdlg/tpview.cxx| 186 ++---
sc/source/ui/src/optdlg.src | 179 -
sc/source/ui/src/scstring.src | 15 +
sc/uiconfig/scalc/ui/scgeneralpage.ui | 460 ++
9 files changed, 582 insertions(+), 319 deletions(-)
New commits:
commit 813e8bc2268d74a2e7ce2d9f1cb5ae9c412086a6
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Mon Jun 10 11:53:21 2013 +0200
Convert sc general option page to .ui format
Change-Id: I06487f74b8dfdf27b067c1bdb6e47a5fa8babf30
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 8fc9e35..9e7fb46 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/optdefaultpage \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
+ sc/uiconfig/scalc/ui/scgeneralpage \
sc/uiconfig/scalc/ui/sheetprintpage \
sc/uiconfig/scalc/ui/rightfooterdialog \
sc/uiconfig/scalc/ui/rightheaderdialog \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index afef8bb..15086f9 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -68,7 +68,6 @@
#define HID_SCPAGE_SUBT_GROUP3
SC_HID_SCPAGE_SUBT_GROUP3
#define HID_SCPAGE_CONTENT
SC_HID_SCPAGE_CONTENT
-#define HID_SCPAGE_LAYOUT
SC_HID_SCPAGE_LAYOUT
#define HID_SC_NAVIGATOR
SC_HID_SC_NAVIGATOR
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 7b823b0..e98448c 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -830,6 +830,7 @@
#define SCSTR_ORIENTATION_BOTTOMTOP (STR_START + 111)
#define SCSTR_ORIENTATION_STANDARD (STR_START + 112)
#define SCSTR_AUTHOR(STR_START + 113)
+#define SCSTR_UNIT (STR_START + 114)
// accessibility
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 4103d54..d815de1 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -77,16 +77,11 @@
#define CB_SYNCZOOM 35
// TP_LAYOUT
-#define GB_LINK 1
-#define RB_ALWAYS 2
-#define RB_REQUEST 3
-#define RB_NEVER4
#define CB_DOCONLY 5
#define CB_MERGE_PARA_DIST 6
#define GB_COMPAT 7
#define CB_AUTO_UPDATE_FIELDS 8
#define CB_AUTO_UPDATE_CHARTS 9
-#define FT_UPDATE_LINKS 10
#define GB_WINDOW 50
#define CB_ROWCOLHEADER 51
@@ -98,30 +93,14 @@
#define FT_COLOR58
#define LB_COLOR59
#define CB_GUIDELINE60
-#define GB_UNIT 61
-#define LB_UNIT 62
-#define ST_UNIT 63
-#define MF_TAB 65
#define CB_PAGEBREAKS 66
-#define FT_TAB 69
-#define FT_UNIT 70
#define FL_SEPARATOR1 71
#define FL_SEPARATOR2 72
-#define FL_SEPARATOR73
#define FT_GRID 74
#define LB_GRID 75
// TP_INPUT
-#define GB_OPTIONS 70
-#define CB_ALIGN71
-#define LB_ALIGN72
-#define CB_EDITMODE 73
-#define CB_FORMAT 74
#define CB_RFIND75
-#define CB_EXPREF 76
-#define CB_MARKHDR 77
-#define CB_TEXTFMT 78
-#define CB_REPLWARN 79
// TP_FORMULA
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 0bb22a5..7f786cb 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -103,28 +103,21 @@ public:
class ScDocument;
class ScTpLayoutOptions : public SfxTabPage
{
-FixedLine aUnitGB;
-FixedText aUnitFT;
-ListBox aUnitLB;
-FixedText aTabFT;
-MetricField aTabMF;
-
-FixedLine aSeparatorFL;
-FixedLine aLinkGB;
-FixedText aLinkFT;
-RadioButton aAlwaysRB;
-RadioButton aRequestRB;
-RadioButton aNeverRB;
-
-FixedLine aOptionsGB;
-CheckBoxaAlignCB;
-ListBox aAlignLB;
-CheckBoxaEditModeCB;
-CheckBoxaFormatCB;
-CheckBoxaExpRefCB;
-CheckBoxaMarkHdrCB;
-CheckBoxaTextFmtCB;
-CheckBoxaReplWarnCB;
+ListBox*m_pUnitLB;
+MetricField*m_pTabMF;
+
+RadioButton*m_pAlwaysRB;
+RadioButton*m_pRequestRB;
+RadioButton*m_pNeverRB;
+
+CheckBox* m_pAlignCB;
+ListBox*m_pAlignLB;
+CheckBox* m_pEditModeCB;
+CheckBox* m_pFormatCB;
+CheckBox* m_pExpRefCB;
+CheckBox* m_pMarkHdrCB;
+CheckBox* m_pTextFmtCB;
+CheckBox* m_pReplWarnCB;
SvxStringArray
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/AllLangResTarget_cui.mk |1
cui/UIConfig_cui.mk |1
cui/source/inc/helpid.hrc |1
cui/source/options/optjsearch.cxx | 275 -
cui/source/options/optjsearch.hrc | 43 ---
cui/source/options/optjsearch.hxx | 41 +--
cui/source/options/optjsearch.src | 181
cui/uiconfig/ui/optjsearchpage.ui | 418 ++
8 files changed, 575 insertions(+), 386 deletions(-)
New commits:
commit 1543e30a33832e882b973f0ae8722e6c88a46963
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Thu Jun 6 17:04:41 2013 +0200
Convert Search in Japanese page to .ui format
Change-Id: I1874f36d3e69b39fcb456de85b28c7a09f7bdbf2
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 518444f..163ce00 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/opthtml.src \
cui/source/options/optinet2.src \
cui/source/options/optjava.src \
-cui/source/options/optjsearch.src \
cui/source/options/optlingu.src \
cui/source/options/optpath.src \
cui/source/options/optsave.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 8cb1c66..4bd60b4 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optfltrpage \
cui/uiconfig/ui/optfontspage \
cui/uiconfig/ui/optgeneralpage \
+ cui/uiconfig/ui/optjsearchpage \
cui/uiconfig/ui/optlanguagespage \
cui/uiconfig/ui/optmemorypage \
cui/uiconfig/ui/optonlineupdatepage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index bbae785..1fc1141 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -38,7 +38,6 @@
#define HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
#define HID_OPTIONS_JAVA_PARAMETER CUI_HID_OPTIONS_JAVA_PARAMETER
#define HID_OPTIONS_JAVA_CLASSPATH CUI_HID_OPTIONS_JAVA_CLASSPATH
-#define HID_SVXPAGE_JSEARCH_OPTIONS CUI_HID_SVXPAGE_JSEARCH_OPTIONS
#define HID_SVXDLG_FILTER_WARNING CUI_HID_SVXDLG_FILTER_WARNING
#define HID_OFADLG_OPTIONS_TREE CUI_HID_OFADLG_OPTIONS_TREE
#define HID_OFA_CONNPOOL_DRIVERLIST CUI_HID_OFA_CONNPOOL_DRIVERLIST
diff --git a/cui/source/options/optjsearch.cxx
b/cui/source/options/optjsearch.cxx
index 86770d5..fa183e7 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -23,38 +23,35 @@
#include cuires.hrc
#include dialmgr.hxx
#include optjsearch.hxx
-#include optjsearch.hrc
using namespace com::sun::star::i18n;
//
SvxJSearchOptionsPage::SvxJSearchOptionsPage( Window* pParent, const
SfxItemSet rSet ) :
-SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_JSEARCH_OPTIONS ), rSet ),
-
-aTreatAsEqual ( this, CUI_RES( FL_TREAT_AS_EQUAL ) ),
-aMatchCase ( this, CUI_RES( CB_MATCH_CASE ) ),
-aMatchFullHalfWidth ( this, CUI_RES( CB_MATCH_FULL_HALF_WIDTH ) ),
-aMatchHiraganaKatakana ( this, CUI_RES( CB_MATCH_HIRAGANA_KATAKANA )
),
-aMatchContractions ( this, CUI_RES( CB_MATCH_CONTRACTIONS ) ),
-aMatchMinusDashChoon( this, CUI_RES( CB_MATCH_MINUS_DASH_CHOON ) ),
-aMatchRepeatCharMarks ( this, CUI_RES( CB_MATCH_REPEAT_CHAR_MARKS )
),
-aMatchVariantFormKanji ( this, CUI_RES( CB_MATCH_VARIANT_FORM_KANJI )
),
-aMatchOldKanaForms ( this, CUI_RES( CB_MATCH_OLD_KANA_FORMS ) ),
-aMatchDiziDuzu ( this, CUI_RES( CB_MATCH_DIZI_DUZU ) ),
-aMatchBavaHafa ( this, CUI_RES( CB_MATCH_BAVA_HAFA ) ),
-aMatchTsithichiDhizi( this, CUI_RES( CB_MATCH_TSITHICHI_DHIZI ) ),
-aMatchHyuiyuByuvyu ( this, CUI_RES( CB_MATCH_HYUFYU_BYUVYU ) ),
-aMatchSesheZeje ( this, CUI_RES( CB_MATCH_SESHE_ZEJE ) ),
-aMatchIaiya ( this, CUI_RES( CB_MATCH_IAIYA ) ),
-aMatchKiku ( this, CUI_RES( CB_MATCH_KIKU ) ),
-aMatchProlongedSoundMark( this, CUI_RES( CB_MATCH_PROLONGED_SOUNDMARK
) ),
-aIgnore ( this, CUI_RES( FL_IGNORE ) ),
-aIgnorePunctuation ( this, CUI_RES( CB_IGNORE_PUNCTUATION ) ),
-aIgnoreWhitespace ( this, CUI_RES( CB_IGNORE_WHITESPACES ) ),
-aIgnoreMiddleDot( this, CUI_RES( CB_IGNORE_MIDDLE_DOT ) )
+SfxTabPage( pParent, OptJSearchPage, cui/ui/optjsearchpage.ui, rSet )
{
-FreeResource();
+get( m_pMatchCase, matchcase);
+get( m_pMatchFullHalfWidth, matchfullhalfwidth);
+get( m_pMatchHiraganaKatakana, matchhiraganakatakana);
+get( m_pMatchContractions, matchcontractions);
+get( m_pMatchMinusDashChoon, matchminusdashchoon);
+get( m_pMatchRepeatCharMarks
[Libreoffice-commits] core.git: sd/AllLangResTarget_sd.mk sd/inc sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/AllLangResTarget_sd.mk |1
sd/UIConfig_simpress.mk |1
sd/inc/helpids.h |1
sd/source/ui/dlg/tpoption.cxx | 44 +++---
sd/source/ui/dlg/tpoption.src | 75 -
sd/source/ui/inc/tpoption.hrc |6 --
sd/source/ui/inc/tpoption.hxx |9 +--
sd/uiconfig/simpress/ui/sdviewpage.ui | 101 ++
8 files changed, 127 insertions(+), 111 deletions(-)
New commits:
commit a638554c02871005e3741ea71ecd59b5fd340809
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Thu Jun 6 11:31:34 2013 +0200
Convert sd view page to .ui
Change-Id: If199b877b762780e4c18b15025454f0dc7912dcd
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index dca617e..5466ad3 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
sd/source/ui/dlg/sdpreslt.src \
sd/source/ui/dlg/tabtempl.src \
sd/source/ui/dlg/tpaction.src \
-sd/source/ui/dlg/tpoption.src \
sd/source/ui/dlg/vectdlg.src \
sd/source/ui/slideshow/slideshow.src \
sd/source/ui/table/TableDesignPane.src \
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index b9cb37e..db9f2c5 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\
$(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/definecustomslideshow \
sd/uiconfig/simpress/ui/masterlayoutdlg \
+ sd/uiconfig/simpress/ui/sdviewpage \
sd/uiconfig/simpress/ui/presentationdialog \
sd/uiconfig/simpress/ui/printeroptions \
sd/uiconfig/simpress/ui/photoalbum \
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index f85f603..b9ba1cb 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -44,7 +44,6 @@
#define HID_SD_BTN_HANDOUT
SD_HID_SD_BTN_HANDOUT
#define HID_SD_WIN_DOCUMENT
SD_HID_SD_WIN_DOCUMENT
#define HID_SD_OPTIONS_LAYOUT
SD_HID_SD_OPTIONS_LAYOUT
-#define HID_SD_OPTIONS_CONTENTS
SD_HID_SD_OPTIONS_CONTENTS
#define HID_SD_EFFECT_PREVIEW
SD_HID_SD_EFFECT_PREVIEW
#define HID_SD_CTL_NEWFOIL
SD_HID_SD_CTL_NEWFOIL
#define HID_SD_NAVIGATOR_TLB
SD_HID_SD_NAVIGATOR_TLB
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index b3084b4..da1321a 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -135,14 +135,12 @@ SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow,
\/
SdTpOptionsContents::SdTpOptionsContents( Window* pParent, const SfxItemSet
rInAttrs ) :
-SfxTabPage ( pParent, SdResId( TP_OPTIONS_CONTENTS ),
rInAttrs ),
-aGrpDisplay ( this, SdResId( GRP_DISPLAY ) ),
-aCbxRuler ( this, SdResId( CBX_RULER ) ),
-aCbxDragStripes ( this, SdResId( CBX_HELPLINES ) ),
-aCbxHandlesBezier ( this, SdResId( CBX_HANDLES_BEZIER ) ),
-aCbxMoveOutline ( this, SdResId( CBX_MOVE_OUTLINE ) )
+SfxTabPage ( pParent, SdViewPage, modules/simpress/ui/sdviewpage.ui,
rInAttrs )
{
-FreeResource();
+get( m_pCbxRuler, ruler);
+get( m_pCbxDragStripes, dragstripes);
+get( m_pCbxHandlesBezier, handlesbezier);
+get( m_pCbxMoveOutline, moveoutline);
}
// ---
@@ -157,17 +155,17 @@ sal_Bool SdTpOptionsContents::FillItemSet( SfxItemSet
rAttrs )
{
sal_Bool bModified = sal_False;
-if( aCbxRuler.GetSavedValue() != aCbxRuler.IsChecked() ||
-aCbxMoveOutline.GetSavedValue() != aCbxMoveOutline.IsChecked() ||
-aCbxDragStripes.GetSavedValue() != aCbxDragStripes.IsChecked() ||
-aCbxHandlesBezier.GetSavedValue() != aCbxHandlesBezier.IsChecked() )
+if( m_pCbxRuler-GetSavedValue() != m_pCbxRuler-IsChecked() ||
+m_pCbxMoveOutline-GetSavedValue() !=
m_pCbxMoveOutline-IsChecked() ||
+m_pCbxDragStripes-GetSavedValue() !=
m_pCbxDragStripes-IsChecked() ||
+m_pCbxHandlesBezier-GetSavedValue() !=
m_pCbxHandlesBezier-IsChecked() )
{
SdOptionsLayoutItem aOptsItem( ATTR_OPTIONS_LAYOUT );
-aOptsItem.GetOptionsLayout().SetRulerVisible( aCbxRuler.IsChecked() );
-aOptsItem.GetOptionsLayout().SetMoveOutline(
aCbxMoveOutline.IsChecked() );
-aOptsItem.GetOptionsLayout().SetDragStripes(
aCbxDragStripes.IsChecked() );
-aOptsItem.GetOptionsLayout().SetHandlesBezier(
aCbxHandlesBezier.IsChecked
