[Libreoffice-commits] core.git: sw/source
sw/source/ui/misc/redlndlg.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dbd8a631bb23c588f52102e5dd2a61c9cd854bc3
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri Dec 27 09:45:05 2013 +0100
Fix stepping to the next change
Bug description:
In the Accept or Reject Changes dialog, when select a change
(it should be after the first few ones) and clicking Accept
or Reject button, acception/rejection is made but after it
not the next change is selected for futher work,
but a random one. This bug doesn't appear in all case,
just if changes are complex enough.
Solution:
The nPos means absolute position so we have to get the next entry
with the corresponding GetEntryAtAbsPos() method. It seems simple
position can differ from absolute positions if changes are
complex enough.
Change-Id: I7996f81c2a09c492f9334f071591291d200d533f
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 298058b..907cdfe 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -833,9 +833,9 @@ void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool
bSelect, sal_Bool bAccept )
{
if( nPos = pTable-GetEntryCount() )
nPos = pTable-GetEntryCount() - 1;
-pEntry = pTable-GetEntry( nPos );
+pEntry = pTable-GetEntryAtAbsPos( nPos );
if( !pEntry nPos-- )
-pEntry = pTable-GetEntry( nPos );
+pEntry = pTable-GetEntryAtAbsPos( nPos );
if( pEntry )
{
pTable-Select( pEntry );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sw/source
sw/source/ui/misc/redlndlg.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d58b0f970a217bf4fc74c7832dc8cf369aae7509
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri Dec 27 09:45:05 2013 +0100
Fix stepping to the next change
Bug description:
In the Accept or Reject Changes dialog, when select a change
(it should be after the first few ones) and clicking Accept
or Reject button, acception/rejection is made but after it
not the next change is selected for futher work,
but a random one. This bug doesn't appear in all case,
just if changes are complex enough.
Solution:
The nPos means absolute position so we have to get the next entry
with the corresponding GetEntryAtAbsPos() method. It seems simple
position can differ from absolute positions if changes are
complex enough.
Change-Id: I7996f81c2a09c492f9334f071591291d200d533f
(cherry picked from commit dbd8a631bb23c588f52102e5dd2a61c9cd854bc3)
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 7885bb4..f1cc96d 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -830,9 +830,9 @@ void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool
bSelect, sal_Bool bAccept )
{
if( nPos = pTable-GetEntryCount() )
nPos = pTable-GetEntryCount() - 1;
-pEntry = pTable-GetEntry( nPos );
+pEntry = pTable-GetEntryAtAbsPos( nPos );
if( !pEntry nPos-- )
-pEntry = pTable-GetEntry( nPos );
+pEntry = pTable-GetEntryAtAbsPos( nPos );
if( pEntry )
{
pTable-Select( pEntry );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: setup_native/source
setup_native/source/win32/customactions/sellang/sorttree.cxx |8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 6ecea097c5a57f39a4815537fdbde2c9c4140d54
Author: Andras Timar andras.ti...@collabora.com
Date: Fri Dec 27 10:26:22 2013 +0100
fdo#72945 sort languages in Windows custom install tree view
Change-Id: I9a35ee7839373b82b47c0d5cc5b329918d337073
diff --git a/setup_native/source/win32/customactions/sellang/sorttree.cxx
b/setup_native/source/win32/customactions/sellang/sorttree.cxx
index 9472a49..6781036 100644
--- a/setup_native/source/win32/customactions/sellang/sorttree.cxx
+++ b/setup_native/source/win32/customactions/sellang/sorttree.cxx
@@ -34,13 +34,7 @@ extern C UINT __stdcall SortTree(MSIHANDLE)
OutputDebugString(SortTree: SysTreeView32 not found\n);
return ERROR_SUCCESS;
}
-HTREEITEM treeRoot = TreeView_GetRoot(hwndTV);
-if (treeRoot == NULL)
-{
-OutputDebugString(SortTree: TreeView_GetRoot failed\n);
-return ERROR_SUCCESS;
-}
-HTREEITEM optional = TreeView_GetNextSibling(hwndTV, treeRoot);
+HTREEITEM optional = TreeView_GetRoot(hwndTV);
if (optional == NULL)
{
OutputDebugString(SortTree: Optional Components branch not found\n);
___
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' - setup_native/source
setup_native/source/win32/customactions/sellang/sorttree.cxx |8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 7f3bcb1e98cb3417594a5fd811babfc8067677f4
Author: Andras Timar andras.ti...@collabora.com
Date: Fri Dec 27 10:26:22 2013 +0100
fdo#72945 sort languages in Windows custom install tree view
Change-Id: I9a35ee7839373b82b47c0d5cc5b329918d337073
diff --git a/setup_native/source/win32/customactions/sellang/sorttree.cxx
b/setup_native/source/win32/customactions/sellang/sorttree.cxx
index 9472a49..6781036 100644
--- a/setup_native/source/win32/customactions/sellang/sorttree.cxx
+++ b/setup_native/source/win32/customactions/sellang/sorttree.cxx
@@ -34,13 +34,7 @@ extern C UINT __stdcall SortTree(MSIHANDLE)
OutputDebugString(SortTree: SysTreeView32 not found\n);
return ERROR_SUCCESS;
}
-HTREEITEM treeRoot = TreeView_GetRoot(hwndTV);
-if (treeRoot == NULL)
-{
-OutputDebugString(SortTree: TreeView_GetRoot failed\n);
-return ERROR_SUCCESS;
-}
-HTREEITEM optional = TreeView_GetNextSibling(hwndTV, treeRoot);
+HTREEITEM optional = TreeView_GetRoot(hwndTV);
if (optional == NULL)
{
OutputDebugString(SortTree: Optional Components branch not found\n);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 15 ++-
1 file changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 793f14db156fab0c3e1ef2e19618ae7f8e01d758
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Thu Dec 26 19:41:57 2013 +
EMF+: Add EMFPlusPointR detection to EMFPPath.
Change-Id: Iff1ae9806ee05654762b313ed00ada206e51337f
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 3d1e3ec..5bea4fc 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -167,18 +167,23 @@ namespace cppcanvas
{
for (int i = 0; i nPoints; i ++) {
if (pathFlags 0x4000) {
-// points are stored in signed short 16bit integer
format
+// EMFPlusPoint: stored in signed short 16bit integer
format
sal_Int16 x, y;
s x y;
-SAL_INFO (cppcanvas.emf, EMF+\tpoint [x,y]: x
, y);
+SAL_INFO (cppcanvas.emf, EMF+\tEMFPlusPoint [x,y]:
x , y);
pPoints [i*2] = x;
pPoints [i*2 + 1] = y;
-} else {
-// points are stored in Single (float) format
+} else if (!(pathFlags 0xC000)) {
+// EMFPlusPointF: stored in Single (float) format
s pPoints [i*2] pPoints [i*2 + 1];
-SAL_INFO (cppcanvas.emf, EMF+\tpoint [x,y]:
pPoints [i*2] , pPoints [i*2 + 1]);
+SAL_INFO (cppcanvas.emf, EMF+\tEMFPlusPointF [x,y]:
pPoints [i*2] , pPoints [i*2 + 1]);
+} else { //if (pathFlags 0x8000)
+// EMFPlusPointR: points are stored in EMFPlusInteger7
or
+// EMFPlusInteger15 objects, see section 2.2.2.21/22
+SAL_INFO(cppcanvas.emf, EMF+\t\tTODO - parse
EMFPlusPointR object (section 2.2.1.6));
}
+
}
if (pPointTypes)
___
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
helpers/help_hid.lst |5 - 1 file changed, 5 deletions(-) New commits: commit 74508d8b773142bf68780b8550ff70baaa53be89 Author: Caolán McNamara caol...@redhat.com Date: Fri Dec 27 11:52:04 2013 + drop unused helpids Change-Id: If167d3412d6f3d184c9554273a54dbd4b6f29fb6 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 079fa61..c76bc0a 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3685,7 +3685,6 @@ HID_WIZARD_NEXT,33022, HID_WIZARD_PREVIOUS,33023, HID_XFORMS_ADDCONDITION_DLG,38109, HID_XFORMS_ADDDATAITEM_DLG,38108, -HID_XFORMS_ADDINSTANCE_DLG,38135, HID_XFORMS_ADDSUBMISSION_DLG,38133, HID_XFORMS_INSTANCES_MENUBTN,38132, HID_XFORMS_ITEMS_LIST,38129, @@ -6443,7 +6442,6 @@ svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_CONSTRAINT,1368851479, svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_READONLY,1368851481, svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_RELEVANT,1368851477, svx_CheckBox_RID_SVXDLG_ADD_DATAITEM_CB_REQUIRED,1368851475, -svx_CheckBox_RID_SVXDLG_ADD_INSTANCE_CB_INST_LINKINST,1368949776, svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_1,339194, svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_2,3391947780, svx_CheckBox_RID_SVXDLG_BMPMASK_CBX_3,3391947779, @@ -6482,7 +6480,6 @@ svx_CheckBox_RID_SVX_MDLG_HANGULHANJA_CB_HANJA_ONLY,1237599235, svx_CheckBox_RID_SVX_MDLG_HANGULHANJA_CB_REPLACE_BY_CHARACTER,1237599233, svx_CheckBox_RID_SVX_SPLITCELLDLG_CB_PROP,1238287371, svx_ComboBox_DLG_DOCUMENTLINK_CMB_URL,1346113537, -svx_ComboBox_RID_SVXDLG_ADD_INSTANCE_ED_INST_URL,1368952846, svx_ComboBox_RID_SVXDLG_IMAP_CBB_URL,2318700545, svx_ComboBox_RID_SVXPAGE_HYPERLINK_DOCUMENT_CB_FRAME,704483360, svx_ComboBox_RID_SVXPAGE_HYPERLINK_INTERNET_CB_FRAME,704450592, @@ -6504,7 +6501,6 @@ svx_Edit_MD_LINKEDIT_ED_FULL_SOURCE_NAME,1598097409, svx_Edit_RID_DLG_NEWLIB_ED_LIBNAME,1242335246, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_DEFAULT,1368852494, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_NAME,1368852492, -svx_Edit_RID_SVXDLG_ADD_INSTANCE_ED_INST_NAME,1368950796, svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_ACTION,1368918030, svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_NAME,1368918028, svx_Edit_RID_SVXDLG_ADD_SUBMISSION_ED_SUBMIT_REF,1368918034, @@ -6833,7 +6829,6 @@ svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_DEFAULT,1368855055, svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_READONLY,1368855066, svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_RELEVANT,1368855062, svx_PushButton_RID_SVXDLG_ADD_DATAITEM_PB_REQUIRED,1368855060, -svx_PushButton_RID_SVXDLG_ADD_INSTANCE_PB_FILEPICKER,1368953359, svx_PushButton_RID_SVXDLG_ADD_SUBMISSION_PB_SUBMIT_REF,1368920595, svx_PushButton_RID_SVXDLG_BMPMASK_BTN_EXEC,3391951361, svx_PushButton_RID_SVXDLG_EDIT_MODULES_PB_EDIT_MODULES_PRIO_BACK,1251201847, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - helpcontent2 include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk
helpcontent2 |2
include/svx/fmresids.hrc |1
svx/UIConfig_svx.mk |1
svx/inc/fmhelp.hrc |1
svx/source/form/datanavi.cxx | 38 +
svx/source/form/datanavi.src | 89 -
svx/source/inc/datanavi.hrc | 11 -
svx/source/inc/datanavi.hxx | 47 ++-
svx/uiconfig/ui/addinstancedialog.ui | 223 +++
9 files changed, 256 insertions(+), 157 deletions(-)
New commits:
commit 8f6a574d4f0fdf9d113aaa073daf948a7ec1df52
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 27 11:43:03 2013 +
convert add instance dialog to .ui
Change-Id: I92a82fb25b8b9d9cbedefb6fcebc7a4d167649bf
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index fdeed41..c44ae4b 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -67,7 +67,6 @@
#define RID_SVXDLG_ADD_SUBMISSION (RID_FORMS_START + 16)
-#define RID_SVXDLG_ADD_INSTANCE (RID_FORMS_START + 18)
#define RID_SVXWIN_DATANAVIGATOR(RID_FORMS_START + 19)
#define RID_SVX_XFORMS_TABPAGES (RID_FORMS_START + 20)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index b3a0ed7..41fb585 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,svx))
$(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/acceptrejectchangesdialog \
+ svx/uiconfig/ui/addinstancedialog \
svx/uiconfig/ui/addmodeldialog \
svx/uiconfig/ui/addnamespacedialog \
svx/uiconfig/ui/asianphoneticguidedialog \
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 4245769..fbe9c7c 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -75,7 +75,6 @@
#define HID_XFORMS_MODELS_MENUBTN
SVX_HID_XFORMS_MODELS_MENUBTN
#define HID_XFORMS_INSTANCES_MENUBTN
SVX_HID_XFORMS_INSTANCES_MENUBTN
#define HID_XFORMS_ADDSUBMISSION_DLG
SVX_HID_XFORMS_ADDSUBMISSION_DLG
-#define HID_XFORMS_ADDINSTANCE_DLG
SVX_HID_XFORMS_ADDINSTANCE_DLG
#define HID_XFORMS_MID_INSERT_CONTROL
SVX_HID_XFORMS_MID_INSERT_CONTROL
#define HID_XFORMS_TAB_CONTROL
SVX_HID_XFORMS_TAB_CONTROL
#define HID_FM_DELETEROWS
SVX_HID_FM_DELETEROWS
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 9820a0b..656f854 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -3597,39 +3597,25 @@ namespace svxform
// class AddInstanceDialog
//
-AddInstanceDialog::AddInstanceDialog( Window* pParent, bool _bEdit ) :
-
-ModalDialog( pParent, SVX_RES( RID_SVXDLG_ADD_INSTANCE ) ),
-
-m_aInstanceFL ( this, SVX_RES( FL_INSTANCE ) ),
-m_aNameFT ( this, SVX_RES( FT_INST_NAME ) ),
-m_aNameED ( this, SVX_RES( ED_INST_NAME ) ),
-m_aURLFT( this, SVX_RES( FT_INST_URL ) ),
-m_aURLED( this, SVX_RES( ED_INST_URL ) ),
-m_aFilePickerBtn( this, SVX_RES( PB_FILEPICKER ) ),
-m_aLinkInstanceCB ( this, SVX_RES( CB_INST_LINKINST ) ),
-m_aButtonsFL( this, SVX_RES( FL_DATANAV_BTN ) ),
-m_aOKBtn( this, SVX_RES( BTN_DATANAV_OK ) ),
-m_aEscBtn ( this, SVX_RES( BTN_DATANAV_ESC ) ),
-m_aHelpBtn ( this, SVX_RES( BTN_DATANAV_HELP ) )
-
+AddInstanceDialog::AddInstanceDialog(Window* pParent, bool _bEdit)
+: ModalDialog(pParent, AddInstanceDialog ,
svx/ui/addinstancedialog.ui)
{
-if ( _bEdit )
-SetText(SVX_RESSTR(STR_EDIT_TEXT));
+get(m_pNameED, name);
+get(m_pURLFT, urlft);
+get(m_pURLED, url);
+get(m_pFilePickerBtn, browse);
+get(m_pLinkInstanceCB, link);
-FreeResource();
+if ( _bEdit )
+SetText(getFixedText(alttitle)-GetText());
-m_aURLED.DisableHistory();
-m_aFilePickerBtn.SetClickHdl( LINK( this, AddInstanceDialog,
FilePickerHdl ) );
+m_pURLED-DisableHistory();
+m_pFilePickerBtn-SetClickHdl( LINK( this, AddInstanceDialog,
FilePickerHdl ) );
// load the filter name from fps_office resource
m_sAllFilterName = ResId(STR_FILTERNAME_ALL,
*ResMgr::CreateResMgr(fps_office)).toString();
}
-AddInstanceDialog::~AddInstanceDialog()
-{
-}
-
//
IMPL_LINK_NOARG(AddInstanceDialog, FilePickerHdl)
{
@@ -3644,7 +3630,7 @@ namespace svxform
aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE
[Libreoffice-commits] core.git: bridges/source ucbhelper/source
bridges/source/cpp_uno/gcc3_ios_arm/except.cxx | 16 ++---
ucbhelper/source/provider/cancelcommandexecution.cxx | 23 ---
2 files changed, 13 insertions(+), 26 deletions(-)
New commits:
commit 17f1b0f551dbacc24fe5e2c90d5f00e5578ab9e7
Author: Tor Lillqvist t...@collabora.com
Date: Fri Dec 27 14:00:51 2013 +0200
Using pre-cached type_infos provided by the typeid operator seems to work
now
Apparently there was no problem in this after all. The reason it
seemed not to work earlier was because of the unwinding failure due to
the missing .cfi_startproc and .cfi_endproc thingies in helper.s
The hack in ucbhelper is now not needed after all.
Change-Id: If9fec5c502d4c9d0c44709ad9c2729f812e882e2
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index 22026cc..2f1df7a 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -35,6 +35,7 @@
#include com/sun/star/uno/genfunc.hxx
#include com/sun/star/uno/RuntimeException.hpp
#include com/sun/star/ucb/InteractiveAugmentedIOException.hpp
+#include com/sun/star/ucb/NameClashException.hpp
#include typelib/typedescription.hxx
#include uno/any2.h
@@ -171,12 +172,21 @@ public:
RTTI::RTTI() SAL_THROW(())
: m_hApp( dlopen( 0, RTLD_LAZY ) )
{
-#if 0
// Insert commonly needed type_infos to avoid dlsym() calls
-// Ideally we should insert all needed ones
+// Ideally we should insert all needed ones, and we actually must,
+// for arm64, as the dynamically generated type_infos don't seem
+// to work correctly. Luckily it seems that quite few types of
+// exceptions are thrown through the C++/UNO bridge at least in
+// the TiledLibreOffice test app.
+
+// (As no Java, Basic or Python is supported in LO code on iOS, we
+// can know the set of types of exceptions throws a priori, so
+// keeping this list complete should be possible.)
+
m_rttis.insert( t_rtti_map::value_type(
com.sun.star.ucb.InteractiveAugmentedIOException,
(std::type_info*) typeid(
com::sun::star::ucb::InteractiveAugmentedIOException ) ) );
-#endif
+m_rttis.insert( t_rtti_map::value_type(
com.sun.star.ucb.NameClashException,
+(std::type_info*) typeid(
com::sun::star::ucb::NameClashException ) ) );
}
RTTI::~RTTI() SAL_THROW(())
diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx
b/ucbhelper/source/provider/cancelcommandexecution.cxx
index 617c96c..2f4e42e 100644
--- a/ucbhelper/source/provider/cancelcommandexecution.cxx
+++ b/ucbhelper/source/provider/cancelcommandexecution.cxx
@@ -74,22 +74,6 @@ void cancelCommandExecution( const uno::Any rException,
}
}
-#if defined IOS defined __arm64
-// No Java, Basic, or Python on iOS, so try to throw the exception
-// directly. Much simpler. Especially as I haven't managed yet to
-// get the C++/UNO bridge to work for arm64, and this
-// cppu::throwException thing seems to be the only use for it, at
-// least in the test apps...
-
-ucb::NameClashException aNCE;
-if ( rException = aNCE )
-throw aNCE;
-
-lang::IllegalArgumentException aIAE;
-if ( rException = aIAE )
-throw aIAE;
-#endif
-
cppu::throwException( rException );
OSL_FAIL( Return from cppu::throwException call!!! );
throw uno::RuntimeException();
@@ -127,13 +111,6 @@ void cancelCommandExecution( const ucb::IOErrorCode eError,
}
}
-#if defined IOS defined __arm64
-// See comment above.
-ucb::InteractiveAugmentedIOException aExc;
-if ( xRequest-getRequest() = aExc )
-throw aExc;
-#endif
-
cppu::throwException( xRequest-getRequest() );
OSL_FAIL( Return from cppu::throwException call!!! );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - idl/source reportdesign/source sc/source
idl/source/objects/module.cxx | 10 +++---
reportdesign/source/ui/report/dlgedfunc.cxx |3 +--
sc/source/ui/miscdlgs/datastreamdlg.cxx |1 -
3 files changed, 4 insertions(+), 10 deletions(-)
New commits:
commit 97599c406ec289c8a876bf9a834bf61a4e80b7ee
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 27 14:27:54 2013 +0100
cppcheck: fix 2 consecutive breaks
Change-Id: If67b90bc56695a6aaf6d152d4a70dc68126596a6
diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx
b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index 8a3bee5..8f8aee9 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -140,7 +140,6 @@ void DataStreamDlg::Init( const DataStream rStrm )
case DataStream::MOVE_DOWN:
m_pRBDataDown-Check();
break;
-break;
case DataStream::RANGE_DOWN:
m_pRBRangeDown-Check();
break;
commit c959586c09e6269ac8ff44de917e4a900e895728
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 27 14:23:23 2013 +0100
cppcheck: fix Same expression on both sides of '||' + simplify a bit
Change-Id: I7903c4af5263f93dc4d311b73cb21e144a63d8d9
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index b78de74..19c380b 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -151,26 +151,22 @@ void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase
rBase,
sal_uInt16 nTab )
{
SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab );
-if( !aTypeLibFile.getString().isEmpty() ||
!aSlotIdFile.getString().isEmpty() || !aTypeLibFile.getString().isEmpty() )
+if( !aHelpFileName.getString().isEmpty() ||
!aSlotIdFile.getString().isEmpty() || !aTypeLibFile.getString().isEmpty() )
{
+WriteTab( rOutStm, nTab );
if( !aHelpFileName.getString().isEmpty() )
{
-WriteTab( rOutStm, nTab );
aHelpFileName.WriteSvIdl( SvHash_HelpFile(), rOutStm, nTab +1 );
-rOutStm ';' endl;
}
if( !aSlotIdFile.getString().isEmpty() )
{
-WriteTab( rOutStm, nTab );
aSlotIdFile.WriteSvIdl( SvHash_SlotIdFile(), rOutStm, nTab +1 );
-rOutStm ';' endl;
}
if( !aTypeLibFile.getString().isEmpty() )
{
-WriteTab( rOutStm, nTab );
aTypeLibFile.WriteSvIdl( SvHash_TypeLibFile(), rOutStm, nTab +1 );
-rOutStm ';' endl;
}
+rOutStm ';' endl;
}
}
commit 4148ba7075159c9966b83594e51deb9c9759d722
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 27 14:19:22 2013 +0100
cppcheck: fix reassigned value
Change-Id: Iee162175b692d82679132ce32d026cb3b3bfa77e
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx
b/reportdesign/source/ui/report/dlgedfunc.cxx
index 28a12df..ef5a8f6 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -503,9 +503,8 @@ void DlgEdFunc::unColorizeOverlappedObj()
//
-
bool DlgEdFunc::isOverlapping(const MouseEvent rMEvt)
{
-bool bOverlapping = false;
SdrViewEvent aVEvt;
-bOverlapping = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt) !=
SDRHIT_NONE;
+bool bOverlapping = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt)
!= SDRHIT_NONE;
if (bOverlapping aVEvt.pObj)
{
colorizeOverlappedObject(aVEvt.pObj);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: idl/source
idl/source/objects/module.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 2530d2923c3959ac8efa73e37a4b44cdacec7070
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 27 13:40:35 2013 +
presumably each entry needs a tab and semicolon
Change-Id: Iedb57186d56c6d1445bcfe2ad37d0569dba32b4e
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 19c380b..14acf19 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -153,20 +153,24 @@ void SvMetaModule::WriteAttributesSvIdl( SvIdlDataBase
rBase,
SvMetaExtern::WriteAttributesSvIdl( rBase, rOutStm, nTab );
if( !aHelpFileName.getString().isEmpty() ||
!aSlotIdFile.getString().isEmpty() || !aTypeLibFile.getString().isEmpty() )
{
-WriteTab( rOutStm, nTab );
if( !aHelpFileName.getString().isEmpty() )
{
+WriteTab( rOutStm, nTab );
aHelpFileName.WriteSvIdl( SvHash_HelpFile(), rOutStm, nTab +1 );
+rOutStm ';' endl;
}
if( !aSlotIdFile.getString().isEmpty() )
{
+WriteTab( rOutStm, nTab );
aSlotIdFile.WriteSvIdl( SvHash_SlotIdFile(), rOutStm, nTab +1 );
+rOutStm ';' endl;
}
if( !aTypeLibFile.getString().isEmpty() )
{
+WriteTab( rOutStm, nTab );
aTypeLibFile.WriteSvIdl( SvHash_TypeLibFile(), rOutStm, nTab +1 );
+rOutStm ';' endl;
}
-rOutStm ';' endl;
}
}
___
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/ui/config/optload.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d61a27f278e8442d54d52115981b5235f230ac80
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 27 13:49:52 2013 +
use SfxSingleTabDialogBase here now
Change-Id: Ibd5d82f93fb94db3e8d53acc9df05f2459807bb4
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 3eef208..9300385 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -746,7 +746,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ModifyHdl)
{
OUString sFldTypeName = m_pCategoryBox-GetText();
-SfxNoLayoutSingleTabDialog *pDlg =
dynamic_castSfxNoLayoutSingleTabDialog*(GetParentDialog());
+SfxSingleTabDialogBase *pDlg =
dynamic_castSfxSingleTabDialogBase*(GetParentDialog());
PushButton *pBtn = pDlg ? pDlg-GetOKButton() : NULL;
if (pBtn)
pBtn-Enable(!sFldTypeName.isEmpty());
___
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/source
sw/source/ui/config/optload.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5f9c2a1f731d9e1e4708bb91b5e71bc0b4cc70e0
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 27 13:49:52 2013 +
use SfxSingleTabDialogBase here now
Change-Id: Ibd5d82f93fb94db3e8d53acc9df05f2459807bb4
(cherry picked from commit d61a27f278e8442d54d52115981b5235f230ac80)
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 4a6d5b2..1f275dc 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -746,7 +746,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ModifyHdl)
{
OUString sFldTypeName = m_pCategoryBox-GetText();
-SfxNoLayoutSingleTabDialog *pDlg =
dynamic_castSfxNoLayoutSingleTabDialog*(GetParentDialog());
+SfxSingleTabDialogBase *pDlg =
dynamic_castSfxSingleTabDialogBase*(GetParentDialog());
PushButton *pBtn = pDlg ? pDlg-GetOKButton() : NULL;
if (pBtn)
pBtn-Enable(!sFldTypeName.isEmpty());
___
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/grafctrl.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 4b3b7fc35e4d94d9ec30e0b2fc85b7b961fdcb8d
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 27 13:54:55 2013 +
SfxNoLayoutSingleTabDialog-SfxSingleTabDialog
Change-Id: Ib0d0696b1da5b609473a61aff185282233afb9fd
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 59b7a31..600774b 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -737,18 +737,19 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest
rReq, SdrView rView )
aCropDlgAttr.Put( SdrGrafCropItem( aLTSize.Width(),
aLTSize.Height(),
aRBSize.Width(),
aRBSize.Height() ) );
-SfxNoLayoutSingleTabDialog aCropDialog(
SfxViewShell::Current() ? SfxViewShell::Current()-GetWindow() : NULL,
-aCropDlgAttr, 950 );
-const OUStringaCropStr = SVX_RESSTR(
RID_SVXSTR_GRAFCROP );
+SfxSingleTabDialog aCropDialog(
+SfxViewShell::Current() ?
SfxViewShell::Current()-GetWindow() : NULL,
+aCropDlgAttr);
+const OUString aCropStr(SVX_RESSTR(RID_SVXSTR_GRAFCROP));
SfxAbstractDialogFactory* pFact =
SfxAbstractDialogFactory::Create();
DBG_ASSERT(pFact, Dialogdiet error!);
::CreateTabPage fnCreatePage =
pFact-GetTabPageCreatorFunc( RID_SVXPAGE_GRFCROP );
DBG_ASSERT(fnCreatePage, Dialogdiet error!);
-SfxTabPage* pTabPage = (*fnCreatePage)( aCropDialog,
aCropDlgAttr );
+SfxTabPage* pTabPage = (*fnCreatePage)(
aCropDialog.get_content_area(), aCropDlgAttr );
pTabPage-SetText( aCropStr );
-aCropDialog.SetTabPage( pTabPage );
+aCropDialog.setTabPage( pTabPage );
if( aCropDialog.Execute() == RET_OK )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - basctl/source bridges/source svl/source vcl/source writerfilter/source
basctl/source/dlged/dlgedclip.cxx |4 +---
bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx |1 -
svl/source/config/ctloptions.cxx |4 +---
vcl/source/gdi/outdev.cxx |4 ++--
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
5 files changed, 5 insertions(+), 10 deletions(-)
New commits:
commit aabee4ca0bc5dd9107a8f1a53349bd652c790627
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 27 14:57:54 2013 +0100
cppcheck: fix consecutive break
Change-Id: I028543f751ed8759f694cc4901d8c89d76867596
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
index 8c57046..c923804 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/cpp2uno-arm64.cxx
@@ -168,7 +168,6 @@ namespace
pCppArgs[nPos] = pUnoArgs[nPos] = pStackedArgs;
pStackedArgs += 2;
break;
-break;
case typelib_TypeClass_BOOLEAN:
case typelib_TypeClass_BYTE:
pCppArgs[nPos] = pUnoArgs[nPos] = pStackedArgs;
commit 0a17a19949abcb6077a1b4eecb88808c85ae6c11
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 27 14:56:58 2013 +0100
cppcheck: fix var reassigned
Change-Id: I10bb64672d02626814c162b09b8bdd615f7fcad8
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index 84ffcf6..7ff4c49 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -286,11 +286,9 @@ void SvtCTLOptions_Impl::Load()
if (!m_bCTLFontEnabled)
{
-bool bAutoEnableCTL = false;
-
sal_uInt16 nScriptType =
SvtLanguageOptions::GetScriptTypeOfLanguage(LANGUAGE_SYSTEM);
//system locale is CTL
-bAutoEnableCTL = (nScriptType SCRIPTTYPE_COMPLEX);
+bool bAutoEnableCTL = (nScriptType SCRIPTTYPE_COMPLEX);
LanguageType eSystemLanguage = LANGUAGE_SYSTEM;
commit 203fbb160534496a8385a5d4b254050514eaf5f6
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 27 14:44:59 2013 +0100
cppcheck: fix var reassigned
Change-Id: I9db36a231ea846929f8860d089d77d0126242c26
diff --git a/basctl/source/dlged/dlgedclip.cxx
b/basctl/source/dlged/dlgedclip.cxx
index 68fbf4f..99b8684 100644
--- a/basctl/source/dlged/dlgedclip.cxx
+++ b/basctl/source/dlged/dlgedclip.cxx
@@ -53,8 +53,6 @@ DlgEdTransferableImpl::~DlgEdTransferableImpl()
sal_Bool DlgEdTransferableImpl::compareDataFlavors( const DataFlavor lFlavor,
const DataFlavor rFlavor )
{
-bool bRet = false;
-
// compare mime content types
Reference uno::XComponentContext xContext =
getProcessComponentContext();
Reference datatransfer::XMimeContentTypeFactory
@@ -67,7 +65,7 @@ sal_Bool DlgEdTransferableImpl::compareDataFlavors( const
DataFlavor lFlavor, c
OUString aLFullMediaType = xLType-getFullMediaType();
OUString aRFullMediaType = xRType-getFullMediaType();
-bRet = aLFullMediaType.equalsIgnoreAsciiCase( aRFullMediaType );
+bool bRet = aLFullMediaType.equalsIgnoreAsciiCase( aRFullMediaType );
return bRet;
}
commit 8b29f1eb3b5614b9fde97f12b38faa16141bfdef
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 27 14:39:16 2013 +0100
cppcheck: reduce scope
Change-Id: I9a2e2387eb1d436cd64c1ca00276fe9256ef0c04
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 74d77e0..e10ba5b 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2891,7 +2891,6 @@ void DomainMapper_Impl::CloseFieldCommand()
{
m_bSetUserFieldContent = false;
FieldConversionMap_t aFieldConversionMap = lcl_GetFieldConversion();
-bool bCreateEnhancedField = false;
try
{
@@ -2905,6 +2904,7 @@ void DomainMapper_Impl::CloseFieldCommand()
FieldConversionMap_t::iterator aIt =
aFieldConversionMap.find(sCommand);
if(aIt != aFieldConversionMap.end())
{
+bool bCreateEnhancedField = false;
uno::Reference beans::XPropertySet xFieldProperties;
bool bCreateField = true;
switch (aIt-second.eFieldId)
commit 943e2930e7453857f229efe04ade85cb1dc87faf
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 27 14:36:44 2013 +0100
cppcheck: reduce scope
Change-Id: Id3715b84a2328ca37fbc05d552fe58617ecfa78a
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 8009275..640c505 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -233,8 +233,6 @@ void OutputDevice::ImplDrawPolyPolygon( sal_uInt16 nPoly,
const PolyPolygon rPo
return;
[Libreoffice-commits] core.git: cui/source
cui/source/inc/cuisrchdlg.hxx |6 ++
cui/source/inc/measure.hxx|8 +++-
cui/source/options/cuisrchdlg.cxx | 11 ++-
cui/source/tabpages/measure.cxx | 10 --
4 files changed, 7 insertions(+), 28 deletions(-)
New commits:
commit c6d1938f7559aa6293338b4d756ec7fc0bd79f63
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 27 14:00:28 2013 +
it's a SfxSingleTabDialog not SfxNoLayoutSingleTabDialog
Change-Id: I0c86753fab551a18a9f0c62adc03a3d967947dbf
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index eaa2a14..1ab46e0 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -44,10 +44,8 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog
SvxJSearchOptionsDialog operator == ( const SvxJSearchOptionsDialog );
public:
-SvxJSearchOptionsDialog( Window *pParent,
-const SfxItemSet rOptionsSet,
-sal_Int32 nInitialFlags );
-virtual ~SvxJSearchOptionsDialog();
+SvxJSearchOptionsDialog(Window *pParent,
+const SfxItemSet rOptionsSet, sal_Int32 nInitialFlags);
// Window
virtual voidActivate();
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index b4b7f2e..02273fa 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -81,17 +81,15 @@ public:
};
-/* Derived from SfxNoLayoutSingleTabDialog, in order to be able to be
+/* Derived from SfxSingleTabDialog, in order to be able to be
informed about virtual methods by the control. */
class SvxMeasureDialog : public SfxSingleTabDialog
{
public:
-SvxMeasureDialog( Window* pParent, const SfxItemSet rAttr,
- const SdrView* pView );
-~SvxMeasureDialog();
+SvxMeasureDialog(Window* pParent, const SfxItemSet rAttr,
+const SdrView* pView);
};
-
#endif // INCLUDED_CUI_SOURCE_INC_MEASURE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/cuisrchdlg.cxx
b/cui/source/options/cuisrchdlg.cxx
index 5511875..08ff0bf 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -52,26 +52,19 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(Window
*pParent,
: SfxSingleTabDialog(pParent, rOptionsSet)
, nInitialTlFlags( nInitialFlags )
{
+// pPage will be implicitly destroyed by the
+// SfxSingleTabDialog destructor
pPage = (SvxJSearchOptionsPage *)
SvxJSearchOptionsPage::Create(get_content_area(), rOptionsSet );
setTabPage( pPage );//! implicitly calls pPage-Reset(...)!
pPage-EnableSaveOptions(false);
}
-
-SvxJSearchOptionsDialog::~SvxJSearchOptionsDialog()
-{
-// pPage will be implicitly destroyed by the
-// SfxNoLayoutSingleTabDialog destructor
-}
-
-
void SvxJSearchOptionsDialog::Activate()
{
pPage-SetTransliterationFlags( nInitialTlFlags );
}
-
sal_Int32 SvxJSearchOptionsDialog::GetTransliterationFlags() const
{
return pPage-GetTransliterationFlags();
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 9f1c1af..245b1f6 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -75,16 +75,6 @@ SvxMeasureDialog::SvxMeasureDialog( Window* pParent, const
SfxItemSet rInAttrs,
/*
|*
-|* Dtor
-|*
-\/
-
-SvxMeasureDialog::~SvxMeasureDialog()
-{
-}
-
-/*
-|*
|* Tabpage for changing measure-attributes
|*
\/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sd/qa
oox/source/drawingml/customshapeproperties.cxx |6 ++ sd/qa/unit/data/xml/n762695_0.xml |2 +- sd/qa/unit/data/xml/n762695_1.xml |4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) New commits: commit beba4603ee8e603fff2599bee7f157d90872cb99 Author: Muthu Subramanian sumu...@collabora.com Date: Fri Dec 27 19:59:22 2013 +0530 fdo#72998: Custom shapes have improper size. diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index 48ace8b..247e8cf 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -213,7 +213,13 @@ void CustomShapeProperties::pushToPropSet( const ::oox::core::FilterBase /* rFi aPropertyMap[ PROP_Type ] = OUString( ooxml-non-primitive ); aPropertyMap[ PROP_MirroredX ] = Any( mbMirroredX ); aPropertyMap[ PROP_MirroredY ] = Any( mbMirroredY ); +// Note 1: If Equations are defined - they are processed using internal div by 360 coordinates +// while if they are not, standard ooxml coordinates are used. +// This size specifically affects scaling. +// Note 2: Width and Height are set to 0 to force scaling to 1. awt::Rectangle aViewBox( 0, 0, aSize.Width, aSize.Height ); +if( maGuideList.size() ) +aViewBox = awt::Rectangle( 0, 0, 0, 0 ); aPropertyMap[ PROP_ViewBox ] = aViewBox; Sequence EnhancedCustomShapeAdjustmentValue aAdjustmentValues( maAdjustmentGuideList.size() ); diff --git a/sd/qa/unit/data/xml/n762695_0.xml b/sd/qa/unit/data/xml/n762695_0.xml index 5f3080f..d55c979 100644 --- a/sd/qa/unit/data/xml/n762695_0.xml +++ b/sd/qa/unit/data/xml/n762695_0.xml @@ -83,7 +83,7 @@ /PropertyValue PropertyValue name=Type value=ooxml-non-primitive handle=0 propertyState=DIRECT_VALUE/ PropertyValue name=ViewBox -ViewBox x=0 y=0 width=4820911 height=3908235/ +ViewBox x=0 y=0 width=0 height=0/ /PropertyValue /CustomShapeGeometry /XShape diff --git a/sd/qa/unit/data/xml/n762695_1.xml b/sd/qa/unit/data/xml/n762695_1.xml index d746783..fb24ba08 100644 --- a/sd/qa/unit/data/xml/n762695_1.xml +++ b/sd/qa/unit/data/xml/n762695_1.xml @@ -83,7 +83,7 @@ /PropertyValue PropertyValue name=Type value=ooxml-non-primitive handle=0 propertyState=DIRECT_VALUE/ PropertyValue name=ViewBox -ViewBox x=0 y=0 width=6477000 height=2743200/ +ViewBox x=0 y=0 width=0 height=0/ /PropertyValue /CustomShapeGeometry /XShape @@ -170,7 +170,7 @@ /PropertyValue PropertyValue name=Type value=ooxml-non-primitive handle=0 propertyState=DIRECT_VALUE/ PropertyValue name=ViewBox -ViewBox x=0 y=0 width=6365875 height=3430587/ +ViewBox x=0 y=0 width=0 height=0/ /PropertyValue /CustomShapeGeometry /XShape ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - extensions/source helpcontent2 sfx2/source sot/source svx/source
extensions/source/propctrlr/cellbindinghelper.cxx |3 +--
helpcontent2 |2 +-
sfx2/source/appl/sfxhelp.cxx |1 -
sot/source/sdstor/storage.cxx |3 +--
svx/source/sidebar/tools/ColorControl.cxx |2 +-
5 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit dc836aa46d3436bf631a8f70a5e04d76ff7ad45f
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 27 15:21:43 2013 +0100
cppcheck: remove dups
Change-Id: I59622a66358a688caac36b7da220588dc2da440a
diff --git a/helpcontent2 b/helpcontent2
index 74508d8..0dc1069 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 74508d8b773142bf68780b8550ff70baaa53be89
+Subproject commit 0dc1069fa953547ac90aebf058b6ff18a83e820f
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 3640b46..7cf1b21 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -339,7 +339,6 @@ OUString SfxHelp::GetHelpModuleName_Impl()
|| aFactoryShortName.startsWith(dbapp)
|| aFactoryShortName.startsWith(dbreport)
|| aFactoryShortName.startsWith(swreport)
-|| aFactoryShortName.startsWith(dbbrowser)
|| aFactoryShortName.startsWith(swform) )
aFactoryShortName = sdatabase;
else if ( aFactoryShortName.startsWith(sbibliography)
diff --git a/svx/source/sidebar/tools/ColorControl.cxx
b/svx/source/sidebar/tools/ColorControl.cxx
index 75264f1..0ca0f3c 100644
--- a/svx/source/sidebar/tools/ColorControl.cxx
+++ b/svx/source/sidebar/tools/ColorControl.cxx
@@ -123,7 +123,7 @@ void ColorControl::FillColors (void)
return;
const WinBits aWinBits(maVSColor.GetStyle() | WB_TABSTOP |
WB_ITEMBORDER | WB_NAMEFIELD |
-WB_NO_DIRECTSELECT | WB_MENUSTYLEVALUESET | WB_NO_DIRECTSELECT);
+WB_NO_DIRECTSELECT | WB_MENUSTYLEVALUESET);
maVSColor.SetStyle(aWinBits);
commit f23ae024461665eac0bdcc569eabe9caf28a8943
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 27 15:07:53 2013 +0100
cppcheck: reduce scope
Change-Id: I14956a86b8c83b9432c1eda511371beb026fd680
diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx
b/extensions/source/propctrlr/cellbindinghelper.cxx
index 7182239..8339951 100644
--- a/extensions/source/propctrlr/cellbindinghelper.cxx
+++ b/extensions/source/propctrlr/cellbindinghelper.cxx
@@ -506,9 +506,8 @@ namespace pcr
//
bool CellBindingHelper::doesComponentSupport( const Reference XInterface
_rxComponent, const OUString _rService ) const
{
-bool bDoes = false;
Reference XServiceInfo xSI( _rxComponent, UNO_QUERY );
-bDoes = xSI.is() xSI-supportsService( _rService );
+bool bDoes = xSI.is() xSI-supportsService( _rService );
return bDoes;
}
commit a81896a9d2517155f1d8ec7a98767bfc27c1f0c7
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 27 15:05:23 2013 +0100
cppcheck: reduce scope
Change-Id: If8220e82165d8ab85906584baa3827e3b6f5c2f4
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 3ae0236..9b408647c 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.cxx
@@ -775,7 +775,6 @@ SotStorage * SotStorage::OpenSotStorage( const OUString
rEleName,
StreamMode nMode,
StorageMode nStorageMode )
{
-SotStorage * pStor = NULL;
DBG_ASSERT( Owner(), must be owner );
if( m_pOwnStg )
{
@@ -785,7 +784,7 @@ SotStorage * SotStorage::OpenSotStorage( const OUString
rEleName,
(nStorageMode STORAGE_TRANSACTED) ? false : true );
if( p )
{
-pStor = new SotStorage( p );
+SotStorage * pStor = new SotStorage( p );
if( !nE )
m_pOwnStg-ResetError(); // kein Fehler setzen
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 366e4d65bedc65a787203d1454fa9fb276c3eaac Author: Caolán McNamara caol...@redhat.com Date: Fri Dec 27 14:57:37 2013 + Updated core Project: help 2e0d679adbb3f41915a4a70a46ea556fb8afb368 diff --git a/helpcontent2 b/helpcontent2 index 0dc1069..2e0d679 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 0dc1069fa953547ac90aebf058b6ff18a83e820f +Subproject commit 2e0d679adbb3f41915a4a70a46ea556fb8afb368 ___ 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
helpers/help_hid.lst |1 - 1 file changed, 1 deletion(-) New commits: commit 2e0d679adbb3f41915a4a70a46ea556fb8afb368 Author: Caolán McNamara caol...@redhat.com Date: Fri Dec 27 14:57:37 2013 + drop unused help id Change-Id: If0276965202a04daf6ae716637bfa5e18620956a diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index c76bc0a..e8d2c24 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3685,7 +3685,6 @@ HID_WIZARD_NEXT,33022, HID_WIZARD_PREVIOUS,33023, HID_XFORMS_ADDCONDITION_DLG,38109, HID_XFORMS_ADDDATAITEM_DLG,38108, -HID_XFORMS_ADDSUBMISSION_DLG,38133, HID_XFORMS_INSTANCES_MENUBTN,38132, HID_XFORMS_ITEMS_LIST,38129, HID_XFORMS_MODELS_LIST,38130, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk sw/source
include/svx/fmresids.hrc |6
svx/UIConfig_svx.mk|1
svx/inc/fmhelp.hrc |1
svx/source/form/datanavi.cxx | 311 +--
svx/source/form/datanavi.src | 54 ++---
svx/source/inc/datanavi.hrc|7
svx/source/inc/datanavi.hxx| 129 +++--
svx/uiconfig/ui/addsubmissiondialog.ui | 323 +
sw/source/ui/dialog/swdlgfact.hxx |2
9 files changed, 524 insertions(+), 310 deletions(-)
New commits:
commit accbda12df38ecd4cf120bf30b38c81db64a2118
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 27 14:19:42 2013 +
convert add submission dialog to .ui
and drop the rather lunatic over engineering hackery to make 6 local strings
non local
Change-Id: I619e3d6b5a2205a10407eed98eb3ca83945267e3
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index c44ae4b..3991dd3 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -180,6 +180,12 @@
#define RID_STR_PROPTITLE_SPINBUTTON(RID_FORMS_START + 100)
#define RID_STR_PROPTITLE_HIDDEN(RID_FORMS_START + 101)
// FREE
+#define RID_STR_METHOD_POST (RID_FORMS_START + 118)
+#define RID_STR_METHOD_PUT (RID_FORMS_START + 119)
+#define RID_STR_METHOD_GET (RID_FORMS_START + 120)
+#define RID_STR_REPLACE_NONE(RID_FORMS_START + 121)
+#define RID_STR_REPLACE_INST(RID_FORMS_START + 122)
+#define RID_STR_REPLACE_DOC (RID_FORMS_START + 123)
#define RID_STR_DATANAVIGATOR (RID_FORMS_START + 124)
#define RID_STR_DATANAV_SUBM_PARENT (RID_FORMS_START + 125)
#define RID_STR_DATANAV_SUBM_ID (RID_FORMS_START + 126)
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 41fb585..f2a8087 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/addinstancedialog \
svx/uiconfig/ui/addmodeldialog \
svx/uiconfig/ui/addnamespacedialog \
+ svx/uiconfig/ui/addsubmissiondialog \
svx/uiconfig/ui/asianphoneticguidedialog \
svx/uiconfig/ui/chineseconversiondialog \
svx/uiconfig/ui/compressgraphicdialog \
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index fbe9c7c..953ea76 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -74,7 +74,6 @@
#define HID_XFORMS_MODELS_LIST
SVX_HID_XFORMS_MODELS_LIST
#define HID_XFORMS_MODELS_MENUBTN
SVX_HID_XFORMS_MODELS_MENUBTN
#define HID_XFORMS_INSTANCES_MENUBTN
SVX_HID_XFORMS_INSTANCES_MENUBTN
-#define HID_XFORMS_ADDSUBMISSION_DLG
SVX_HID_XFORMS_ADDSUBMISSION_DLG
#define HID_XFORMS_MID_INSERT_CONTROL
SVX_HID_XFORMS_MID_INSERT_CONTROL
#define HID_XFORMS_TAB_CONTROL
SVX_HID_XFORMS_TAB_CONTROL
#define HID_FM_DELETEROWS
SVX_HID_FM_DELETEROWS
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 656f854..e16abb2 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -23,13 +23,11 @@
#include fmservs.hxx
#include datanavi.hrc
-#include svx/fmresids.hrc
#include fmhelp.hrc
#include svx/svxids.hrc
#include tools/rcid.h
#include tools/diagnose_ex.h
-#include svx/xmlexchg.hxx
-#include svx/dialmgr.hxx
+#include svx/xmlexchg.hxx
#include svx/fmshell.hxx
#include svtools/miscopt.hxx
#include unotools/pathoptions.hxx
@@ -767,191 +765,6 @@ namespace svxform
return m_aItemList.InsertEntry(
sName, aImage, aImage, pParent, sal_False, LIST_APPEND, _pNewNode
);
}
-//
-class lcl_ResourceString
-{
-protected:
-lcl_ResourceString()
-{
-}
-
-lcl_ResourceString( const lcl_ResourceString );
-
-virtual ~lcl_ResourceString()
-{
-}
-
-// load UI resources from resource file
-void init()
-{
-// create a resource manager, for the svx resource file
-// and the UI locale
-ResMgr* pResMgr = ResMgr::CreateResMgr(
-svx, Application::GetSettings().GetUILanguageTag() );
-
-// load the resources for the AddSubmission modal dialog.
-// This will create our own resource context.
-ResId aRes( RID_SVXDLG_ADD_SUBMISSION, *pResMgr );
-aRes.SetRT( RSC_MODALDIALOG );
-pResMgr-GetResource( aRes );
-
-// now, we can access the local resources from the dialog's
-// resource
OpenDocument text (Flat XML) .fodt
I always work with other friends using Github, the .fodt is very, very useful. Many thanks for creating that. I would like to suggest just to break lines more often. Some lines has more than 5000 columns!!! What about break a line each 80 columns?! This will help a lot the versioning systems and also when you need fix merges. Thank you again and Happy New Year to everybody. John ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk
chart2/AllLangResTarget_chartcontroller.mk |1
chart2/UIConfig_chart2.mk|1
chart2/source/controller/dialogs/tp_PolarOptions.cxx | 50 ++---
chart2/source/controller/dialogs/tp_PolarOptions.hrc | 34 ---
chart2/source/controller/dialogs/tp_PolarOptions.hxx | 14 -
chart2/source/controller/dialogs/tp_PolarOptions.src | 87 -
chart2/source/controller/inc/HelpIds.hrc |2
chart2/uiconfig/ui/tp_PolarOptions.ui| 183 +++
8 files changed, 213 insertions(+), 159 deletions(-)
New commits:
commit 1568dc25414945dfaed945d214a0c49ad01b6849
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Tue Dec 24 10:26:30 2013 -0200
Convert chart polar options tab page to widget UI
Conflicts:
chart2/AllLangResTarget_chartcontroller.mk
Change-Id: If9730589e44ab40331ea217986e79d78b926d5af
diff --git a/chart2/AllLangResTarget_chartcontroller.mk
b/chart2/AllLangResTarget_chartcontroller.mk
index b32d4af..69939b5 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
chart2/source/controller/dialogs/Strings_Statistic.src \
chart2/source/controller/dialogs/tp_ChartType.src \
chart2/source/controller/dialogs/tp_DataSource.src \
-chart2/source/controller/dialogs/tp_PolarOptions.src \
chart2/source/controller/dialogs/tp_RangeChooser.src \
))
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index 9f5f044..cc7eee3 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/tp_AxisPositions \
chart2/uiconfig/ui/tp_DataLabel \
chart2/uiconfig/ui/tp_LegendPosition \
+ chart2/uiconfig/ui/tp_PolarOptions \
chart2/uiconfig/ui/tp_SeriesToAxis \
chart2/uiconfig/ui/tp_Scale \
chart2/uiconfig/ui/tp_Trendline \
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 6f5ac96..524401c 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -18,7 +18,6 @@
*/
#include tp_PolarOptions.hxx
-#include tp_PolarOptions.hrc
#include ResId.hxx
#include chartview/ChartSfxItemIds.hxx
@@ -30,18 +29,19 @@ namespace chart
{
PolarOptionsTabPage::PolarOptionsTabPage( Window* pWindow,const SfxItemSet
rInAttrs ) :
-SfxTabPage( pWindow, SchResId(TP_POLAROPTIONS), rInAttrs ),
-m_aCB_Clockwise( this, SchResId( CB_CLOCKWISE ) ),
-m_aFL_StartingAngle( this, SchResId( FL_STARTING_ANGLE ) ),
-m_aAngleDial( this, SchResId( CT_ANGLE_DIAL ) ),
-m_aFT_Degrees( this, SchResId( FT_ROTATION_DEGREES ) ),
-m_aNF_StartingAngle( this, SchResId( NF_STARTING_ANGLE ) ),
-m_aFL_PlotOptions( this, SchResId( FL_PLOT_OPTIONS_POLAR ) ),
-m_aCB_IncludeHiddenCells( this, SchResId( CB_INCLUDE_HIDDEN_CELLS_POLAR ) )
+SfxTabPage( pWindow
+,tp_PolarOptions
+,modules/schart/ui/tp_PolarOptions.ui
+,rInAttrs)
{
-FreeResource();
+get(m_pCB_Clockwise, CB_CLOCKWISE);
+get(m_pFL_StartingAngle, frameANGLE);
+get(m_pAngleDial, CT_ANGLE_DIAL);
+get(m_pNF_StartingAngle, NF_STARTING_ANGLE);
+get(m_pFL_PlotOptions, framePLOT_OPTIONS);
+get(m_pCB_IncludeHiddenCells, CB_INCLUDE_HIDDEN_CELLS_POLAR);
-m_aAngleDial.SetLinkedField( m_aNF_StartingAngle );
+m_pAngleDial-SetLinkedField( m_pNF_StartingAngle );
}
PolarOptionsTabPage::~PolarOptionsTabPage()
@@ -55,17 +55,17 @@ SfxTabPage* PolarOptionsTabPage::Create( Window*
pWindow,const SfxItemSet rOutA
sal_Bool PolarOptionsTabPage::FillItemSet( SfxItemSet rOutAttrs )
{
-if( m_aAngleDial.IsVisible() )
+if( m_pAngleDial-IsVisible() )
{
rOutAttrs.Put(SfxInt32Item(SCHATTR_STARTING_ANGLE,
-static_cast sal_Int32 (m_aAngleDial.GetRotation()/100)));
+static_cast sal_Int32 (m_pAngleDial-GetRotation()/100)));
}
-if( m_aCB_Clockwise.IsVisible() )
-
rOutAttrs.Put(SfxBoolItem(SCHATTR_CLOCKWISE,m_aCB_Clockwise.IsChecked()));
+if( m_pCB_Clockwise-IsVisible() )
+
rOutAttrs.Put(SfxBoolItem(SCHATTR_CLOCKWISE,m_pCB_Clockwise-IsChecked()));
-if (m_aCB_IncludeHiddenCells.IsVisible())
-rOutAttrs.Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS,
m_aCB_IncludeHiddenCells.IsChecked()));
+if (m_pCB_IncludeHiddenCells-IsVisible())
+rOutAttrs.Put(SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS,
m_pCB_IncludeHiddenCells-IsChecked()));
return sal_True;
}
@@ -77,33 +77,29 @@ void PolarOptionsTabPage::Reset(const SfxItemSet rInAttrs)
if (rInAttrs.GetItemState(SCHATTR_STARTING_ANGLE, sal_True, pPoolItem) ==
SFX_ITEM_SET)
{
long nTmp = (long)((const
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |5 - source/text/schart/01/0406.xhp |6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) New commits: commit 6fb074934c6ac847fa7a304ff61e8591ac50b0af Author: Caolán McNamara caol...@redhat.com Date: Fri Dec 27 16:26:09 2013 + update help ids for chart polar options .ui conversion Change-Id: I5675485612459c65bc2f30c88c8552a43aa903eb diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e8d2c24..ae272f4 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3028,7 +3028,6 @@ HID_SCH_NUM_OF_LINES,63323, HID_SCH_PB_NUMBERFORMAT,63368, HID_SCH_PB_PERCENT_NUMBERFORMAT,63369, HID_SCH_SERIES_LIST,63295, -HID_SCH_STARTING_ANGLE_DIAL,63374, HID_SCH_STATISTIK_BIGERROR,63349, HID_SCH_STATISTIK_BIGERROR_VALUE,63352, HID_SCH_STATISTIK_CONSTERROR,63350, @@ -5604,8 +5603,6 @@ chart2_CheckBox_TP_CHARTTYPE_CB_SPLINES,551781380, chart2_CheckBox_TP_CHARTTYPE_CB_STACKED,551781379, chart2_CheckBox_TP_CHARTTYPE_CB_XVALUE_SORTING,551781381, chart2_CheckBox_TP_CHARTTYPE_CB_X_AXIS_CATEGORIES,551781377, -chart2_CheckBox_TP_POLAROPTIONS_CB_CLOCKWISE,551764993, -chart2_CheckBox_TP_POLAROPTIONS_CB_INCLUDE_HIDDEN_CELLS_POLAR,551764994, chart2_CheckBox_TP_RANGECHOOSER_CB_FIRST_COLUMN_ASLABELS,551797762, chart2_CheckBox_TP_RANGECHOOSER_CB_FIRST_ROW_ASLABELS,551797761, chart2_Edit_TP_DATA_SOURCE_EDT_CATEGORIES,551848056, @@ -5618,7 +5615,6 @@ chart2_ImageButton_TP_RANGECHOOSER_IB_RANGE,551808513, chart2_ListBox_TP_CHARTTYPE_LB_3D_SCHEME,551783937, chart2_ListBox_TP_LOCATION_LB_TABLE,551833089, chart2_ModalDialog_DLG_DATA_YERRORBAR,1087537152, -chart2_NumericField_TP_POLAROPTIONS_NF_STARTING_ANGLE,551770113, chart2_PushButton_TP_CHARTTYPE_PB_SPLINE_DIALOG,551784961, chart2_PushButton_TP_DATA_SOURCE_BTN_ADD,551850526, chart2_PushButton_TP_DATA_SOURCE_BTN_DOWN,551850646, @@ -5632,7 +5628,6 @@ chart2_RadioButton_TP_RANGECHOOSER_RB_DATAROWS,551797249, chart2_TabPage_TP_DATA_SOURCE,551845888, chart2_TabPage_TP_LAYOUT,551731200, chart2_TabPage_TP_LOCATION,551829504, -chart2_TabPage_TP_POLAROPTIONS,551763968, chart2_TabPage_TP_RANGECHOOSER,551796736, chart2_TabPage_TP_WIZARD_TITLEANDOBJECTS,551813120, chart2_TabPage_TP_YERRORBAR,551927808, diff --git a/source/text/schart/01/0406.xhp b/source/text/schart/01/0406.xhp index 0202e3e..d278b28 100644 --- a/source/text/schart/01/0406.xhp +++ b/source/text/schart/01/0406.xhp @@ -63,15 +63,15 @@ paragraph xml-lang=en-US id=hd_id9842219 role=heading level=2 l10n=NEWShow bars side by side/paragraph paragraph xml-lang=en-US id=par_id9800103 role=paragraph l10n=NEWIf two axes are shown in a bar chart, and some data series are attached to the first axis, while some other data series are attached to the second axis, then both sets of data series are shown independently, overlapping each other./paragraph paragraph xml-lang=en-US id=par_id2144535 role=paragraph l10n=NEWAs a result, bars attached to the first y-axis are partly or completely hidden by bars attached to the second y-axis. To avoid this, enable the option to display bars side by side. ahelp hid=.The bars from different data series are shown as if they were attached only to one axis./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/chart2:CheckBox:TP_POLAROPTIONS:CB_CLOCKWISE id=bm_id7622913 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_PolarOptions/CB_CLOCKWISE id=bm_id7622913 localize=false/ paragraph xml-lang=en-US id=hd_id24414 role=heading level=2 l10n=NEWClockwise direction/paragraph paragraph xml-lang=en-US id=par_id2527237 role=paragraph l10n=NEWAvailable for pie and donut charts. ahelp hid=.The default direction in which the pieces of a pie chart are ordered is counterclockwise. Enable the emphClockwise direction/emph checkbox to draw the pieces in opposite direction./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_STARTING_ANGLE_DIAL id=bm_id2421643 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_PolarOptions/CT_ANGLE_DIAL id=bm_id2421643 localize=false/ paragraph xml-lang=en-US id=hd_id401013 role=heading level=2 l10n=NEWStarting angle/paragraph paragraph xml-lang=en-US id=par_id761131 role=paragraph l10n=NEWahelp hid=.Drag the small dot along the circle or click any position on the circle to set the starting angle of a pie or donut chart. The starting angle is the mathematical angle position where the first piece is drawn. The value of 90 degrees draws the first piece at the 12 o'clock position. A value of 0 degrees starts at the 3 o'clock position./ahelp/paragraph paragraph xml-lang=en-US id=par_id553910 role=note l10n=NEWIn 3D pie and donut charts that were created with older versions of the software, the starting angle is 0 degrees instead of 90 degrees. For old and new 2D charts the default starting angle is 90 degrees./paragraph paragraph
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 79e7109b746f79880b944d90542fe69f04bf3be6 Author: Caolán McNamara caol...@redhat.com Date: Fri Dec 27 16:26:09 2013 + Updated core Project: help 6fb074934c6ac847fa7a304ff61e8591ac50b0af diff --git a/helpcontent2 b/helpcontent2 index 2e0d679..6fb0749 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 2e0d679adbb3f41915a4a70a46ea556fb8afb368 +Subproject commit 6fb074934c6ac847fa7a304ff61e8591ac50b0af ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54514] PRINT PREVIEW: Old icon for page left
https://bugs.freedesktop.org/show_bug.cgi?id=54514 --- Comment #28 from Julien Nabet serval2...@yahoo.fr --- It seems MacOs only since I can reproduce this with MacOs 10.7 and LO 4.1.4 Does anyone reproduce this problem with 4.1.4 and other platform than MacOs? A code pointer would be useful here. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk
chart2/AllLangResTarget_chartcontroller.mk |1
chart2/UIConfig_chart2.mk |1
chart2/source/controller/dialogs/dlg_InsertLegend.cxx | 14
chart2/source/controller/dialogs/dlg_InsertLegend.hrc | 25 -
chart2/source/controller/dialogs/dlg_InsertLegend.src | 37 -
chart2/source/controller/dialogs/res_LegendPosition.cxx | 220 ---
chart2/source/controller/dialogs/res_LegendPosition.hxx | 45 --
chart2/source/controller/dialogs/res_LegendPosition_IDs.hrc | 26 -
chart2/source/controller/inc/HelpIds.hrc|1
chart2/source/controller/inc/dlg_InsertLegend.hxx | 15
chart2/uiconfig/ui/dlg_InsertLegend.ui | 233
11 files changed, 244 insertions(+), 374 deletions(-)
New commits:
commit 9143eaff7294e69b64978136880a8607e2100743
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Wed Dec 25 21:09:50 2013 -0200
Convert chart legend dialog to widget UI
Conflicts:
chart2/AllLangResTarget_chartcontroller.mk
Change-Id: Ibc265efe5a8bdf3e0e5fb8135fb0487de7e96764
Reviewed-on: https://gerrit.libreoffice.org/7199
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/chart2/AllLangResTarget_chartcontroller.mk
b/chart2/AllLangResTarget_chartcontroller.mk
index 69939b5..f09bfb6 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -49,7 +49,6 @@ $(eval $(call
gb_SrsTarget_add_nonlocalizable_files,chart2/res,\
chart2/source/controller/dialogs/dlg_CreationWizard.src \
chart2/source/controller/dialogs/dlg_InsertDataLabel.src \
chart2/source/controller/dialogs/dlg_InsertErrorBars.src \
-chart2/source/controller/dialogs/dlg_InsertLegend.src \
chart2/source/controller/dialogs/tp_ErrorBars.src \
chart2/source/controller/dialogs/tp_PointGeometry.src \
chart2/source/controller/menus/ShapeContextMenu.src \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index cc7eee3..2e3a21c 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/smoothlinesdlg \
chart2/uiconfig/ui/steppedlinesdlg \
chart2/uiconfig/ui/titlerotationtabpage \
+ chart2/uiconfig/ui/dlg_InsertLegend \
chart2/uiconfig/ui/tp_3D_SceneAppearance \
chart2/uiconfig/ui/tp_3D_SceneGeometry \
chart2/uiconfig/ui/tp_3D_SceneIllumination \
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index c8513d2..5d1f0f4 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -18,10 +18,7 @@
*/
#include dlg_InsertLegend.hxx
-#include dlg_InsertLegend.hrc
#include res_LegendPosition.hxx
-#include ObjectNameProvider.hxx
-#include ResId.hxx
namespace chart
{
@@ -29,14 +26,11 @@ namespace chart
using namespace ::com::sun::star;
SchLegendDlg::SchLegendDlg(Window* pWindow, const uno::Reference
uno::XComponentContext xCC )
-: ModalDialog(pWindow, SchResId(DLG_LEGEND))
-, m_apLegendPositionResources( new oldLegendPositionResources(this,xCC) )
-, aBtnOK(this, SchResId(BTN_OK))
-, aBtnCancel(this, SchResId(BTN_CANCEL))
-, aBtnHelp(this, SchResId(BTN_HELP))
+: ModalDialog(pWindow
+,dlg_InsertLegend
+,modules/schart/ui/dlg_InsertLegend.ui)
+, m_apLegendPositionResources( new LegendPositionResources(*this,xCC) )
{
-FreeResource();
-this-SetText( ObjectNameProvider::getName(OBJECTTYPE_LEGEND) );
}
SchLegendDlg::~SchLegendDlg()
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.hrc
b/chart2/source/controller/dialogs/dlg_InsertLegend.hrc
deleted file mode 100644
index fd728a0..000
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.hrc
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at
[Libreoffice-commits] core.git: 4 commits - writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 37 writerfilter/source/doctok/resourceids.xsl | 25 --- writerfilter/source/doctok/resources.xmi | 194 - writerfilter/source/ooxml/model.xml|6 writerfilter/source/rtftok/rtfdocumentimpl.cxx |8 - 5 files changed, 12 insertions(+), 258 deletions(-) New commits: commit 6a59fbefbfbc90d6febd43e689773f88deaf36b3 Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Dec 27 18:04:49 2013 +0100 writerfilter: remove unused STYLESHEET in doctok Change-Id: I9160730029cf2272172b50726168390ac6093daf diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 97ae897..48278e3 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -413,22 +413,6 @@ void DomainMapper::lcl_attribute(Id nName, Value val) break; case NS_rtf::LN_FHIDDEN: break; -case NS_rtf::LN_CSTD: -break; -case NS_rtf::LN_CBSTDBASEINFILE: -break; -case NS_rtf::LN_FSTDSTYLENAMESWRITTEN: -break; -case NS_rtf::LN_UNUSED4_2: -break; -case NS_rtf::LN_STIMAXWHENSAVED: -break; -case NS_rtf::LN_ISTDMAXFIXEDWHENSAVED: -break; -case NS_rtf::LN_NVERBUILTINNAMESWHENSAVED: -break; -case NS_rtf::LN_RGFTCSTANDARDCHPSTSH: -break; case NS_rtf::LN_WIDENT: case NS_rtf::LN_NFIB: @@ -826,7 +810,7 @@ void DomainMapper::lcl_attribute(Id nName, Value val) break; case NS_ooxml::LN_FONTTABLE: break; -case NS_rtf::LN_STYLESHEET: +case NS_ooxml::LN_STYLESHEET: break; case NS_rtf::LN_fcEastAsianLayout: @@ -4096,7 +4080,7 @@ void DomainMapper::lcl_table(Id name, writerfilter::ReferenceTable::Pointer_t // each entry call inserts a new font entry ref-resolve( *m_pImpl-GetFontTable() ); break; -case NS_rtf::LN_STYLESHEET: +case NS_ooxml::LN_STYLESHEET: //same as above to import style sheets m_pImpl-SetStyleSheetImport( true ); ref-resolve( *m_pImpl-GetStyleSheetTable() ); diff --git a/writerfilter/source/doctok/resourceids.xsl b/writerfilter/source/doctok/resourceids.xsl index ff5ce87..305d193 100644 --- a/writerfilter/source/doctok/resourceids.xsl +++ b/writerfilter/source/doctok/resourceids.xsl @@ -106,31 +106,6 @@ const Id /xsl:text /xsl:for-each /xsl:for-each xsl:text - -/* Classes *//xsl:text -xsl:for-each select='.//UML:Class[@name!=reserved]' - xsl:variable name=pos select=position()/ - xsl:for-each select='.//UML:TaggedValue[.//UML:TagDefinition/@xmi.idref=classid]' -xsl:choose - xsl:when test='.//UML:Stereotype[@xmi.idref=noqname]'/ - xsl:when test='generate-id(UML:TaggedValue.dataValue) != generate-id(key(same-valued-tagged-data, UML:TaggedValue.dataValue)[1])'/ - xsl:otherwise -xsl:text -const Id /xsl:text -xsl:call-template name='idtoqname' - xsl:with-param name='id'xsl:value-of select='.//UML:TaggedValue.dataValue'//xsl:with-param -/xsl:call-template -xsl:text = /xsl:text -xsl:value-of select='3 + $pos'/ -xsl:text; // 0x/xsl:text -xsl:call-template name=dectohex - xsl:with-param name=number select=3 + position()/ -/xsl:call-template - /xsl:otherwise -/xsl:choose - /xsl:for-each -/xsl:for-each -xsl:text } namespace NS_dff diff --git a/writerfilter/source/doctok/resources.xmi b/writerfilter/source/doctok/resources.xmi index a79033c..4928196 100644 --- a/writerfilter/source/doctok/resources.xmi +++ b/writerfilter/source/doctok/resources.xmi @@ -3971,114 +3971,6 @@ /UML:Classifier.feature /UML:Class !--Class Style-- -!--Class StyleSheet-- -UML:Class xmi.id=StyleSheet name=StyleSheet - UML:Classifier.feature -UML:Attribute name=cstd - UML:ModelElement.taggedValue -UML:TaggedValue - UML:TaggedValue.dataValuertf:CSTD/UML:TaggedValue.dataValue - UML:TaggedValue.type -UML:TagDefinition xmi.idref=attrid/ - /UML:TaggedValue.type -/UML:TaggedValue - /UML:ModelElement.taggedValue -/UML:Attribute - /UML:Classifier.feature - UML:Classifier.feature -UML:Attribute name=cbSTDBaseInFile - UML:ModelElement.taggedValue -UML:TaggedValue - UML:TaggedValue.dataValuertf:CBSTDBASEINFILE/UML:TaggedValue.dataValue - UML:TaggedValue.type -UML:TagDefinition xmi.idref=attrid/ - /UML:TaggedValue.type -/UML:TaggedValue - /UML:ModelElement.taggedValue -/UML:Attribute -
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 68220, which changed state. Bug 68220 Summary: EDITING: BUG: calc crashes on spell check https://bugs.freedesktop.org/show_bug.cgi?id=68220 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'private/moggi/chart-opengl2'
New branch 'private/moggi/chart-opengl2' available with the following commits: commit 37b49f542f1e312c27439eaaccd2d0c44f7b7aac Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Dec 27 21:01:55 2013 +0100 enable that code again Change-Id: I4314c7062195f0593c34b6a11ba2b3ae81811ff8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl2' - chart2/source
chart2/source/view/main/DummyXShape.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 613c085aebe2c71a9bb77a35a0b57e5219cded24
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Dec 27 21:04:50 2013 +0100
test compiling makes some sense
merge with previous patch in final branch
Change-Id: I182b15e3144c68905eb8499fdcbedff583d56709
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 470d6c9..972f02f 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -220,8 +220,8 @@ void DummyXShape::setParent( const uno::Reference
uno::XInterface xParent )
namespace {
-void setProperties( uno::Reference beans::XPropertySet , const
tPropertyNameMap ,
-std::mapOUString, uno::Any )
+void setProperties( uno::Reference beans::XPropertySet xPropSet, const
tPropertyNameMap rPropertyNameMap,
+std::mapOUString, uno::Any rTargetMap)
{
tNameSequence aNames;
tAnySequence aValues;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl2' - chart2/source
chart2/source/view/main/DummyXShape.cxx | 20
1 file changed, 16 insertions(+), 4 deletions(-)
New commits:
commit c8b7dbe846f559eea58732536b28eb9c33dfe418
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Dec 27 21:09:49 2013 +0100
set a few more missed properties
Change-Id: I30a606e2bea9c8c8d7861e5b05a6df0e7c00b9a5
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 972f02f..7e09cbc 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -235,6 +235,16 @@ void setProperties( uno::Reference beans::XPropertySet
xPropSet, const tPrope
}
}
+void setProperties( const tNameSequence rNames, const tAnySequence rValues,
+std::mapOUString, uno::Any rTargetMap)
+{
+sal_Int32 nSize = std::min(rNames.getLength(), rValues.getLength());
+for(sal_Int32 i = 0; i nSize; ++i)
+{
+rTargetMap[rNames[i]] = rValues[i];
+}
+}
+
}
DummyCube::DummyCube(const drawing::Position3D rPos, const
drawing::Direction3D rSize,
@@ -363,18 +373,20 @@ DummyRectangle::DummyRectangle(const awt::Size rSize)
setSize(rSize);
}
-DummyRectangle::DummyRectangle(const awt::Size rSize, const awt::Point
rPoint, const tNameSequence ,
-const tAnySequence )
+DummyRectangle::DummyRectangle(const awt::Size rSize, const awt::Point
rPoint, const tNameSequence rNames,
+const tAnySequence rValues)
{
setSize(rSize);
setPosition(rPoint);
+setProperties(rNames, rValues, maProperties);
}
-DummyText::DummyText(const OUString rText, const tNameSequence ,
-const tAnySequence , const uno::Any rTrans ):
+DummyText::DummyText(const OUString rText, const tNameSequence rNames,
+const tAnySequence rValues, const uno::Any rTrans ):
maText(rText),
maTrans(rTrans)
{
+setProperties(rNames, rValues, maProperties);
}
DummyGroup3D::DummyGroup3D(const OUString rName)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl2' - chart2/source
chart2/source/view/main/DummyXShape.cxx | 40 ++--
1 file changed, 38 insertions(+), 2 deletions(-)
New commits:
commit 27353da6081bcd30fcb4131ae1a0ba75ed0e6905
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Dec 27 21:19:59 2013 +0100
also set line properties to the internal properties
Change-Id: I385fc04853d2da33c2ee6c81833289f75c4176bb
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 7e09cbc..2601a38 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -22,6 +22,7 @@
#include vcl/window.hxx
#include tools/gen.hxx
+#include editeng/unoprnms.hxx
#include algorithm
@@ -348,14 +349,49 @@ DummyCircle::DummyCircle(const awt::Point rPos, const
awt::Size rSize)
setSize(rSize);
}
-DummyLine3D::DummyLine3D(const drawing::PolyPolygonShape3D rPoints, const
VLineProperties ):
+namespace {
+
+void setProperties( const VLineProperties rLineProperties, std::mapOUString,
uno::Any rTargetProps )
+{
+//Transparency
+if(rLineProperties.Transparence.hasValue())
+rTargetProps.insert(std::pairOUString, uno::Any(
+UNO_NAME_LINETRANSPARENCE, rLineProperties.Transparence));
+
+//LineStyle
+if(rLineProperties.LineStyle.hasValue())
+rTargetProps.insert(std::pairOUString, uno::Any(
+UNO_NAME_LINESTYLE, rLineProperties.LineStyle));
+
+//LineWidth
+if(rLineProperties.Width.hasValue())
+rTargetProps.insert(std::pairOUString, uno::Any(
+UNO_NAME_LINEWIDTH, rLineProperties.Width));
+
+//LineColor
+if(rLineProperties.Color.hasValue())
+rTargetProps.insert(std::pairOUString, uno::Any(
+UNO_NAME_LINECOLOR, rLineProperties.Transparence));
+
+//LineDashName
+if(rLineProperties.DashName.hasValue())
+rTargetProps.insert(std::pairOUString, uno::Any(
+LineDashName, rLineProperties.DashName));
+}
+
+}
+
+DummyLine3D::DummyLine3D(const drawing::PolyPolygonShape3D rPoints, const
VLineProperties rLineProperties):
maPoints(rPoints)
{
+setProperties(rLineProperties, maProperties);
}
-DummyLine2D::DummyLine2D(const drawing::PointSequenceSequence rPoints, const
VLineProperties* ):
+DummyLine2D::DummyLine2D(const drawing::PointSequenceSequence rPoints, const
VLineProperties* pLineProperties):
maPoints(rPoints)
{
+if(pLineProperties)
+setProperties(*pLineProperties, maProperties);
}
DummyLine2D::DummyLine2D(const awt::Size rSize, const awt::Point rPosition)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
plans to preserve field type info during pdf import?
Opening the irs f1040 form for 2012: f1040.pdf with LibreOffice4.1.2.3 on my ubuntu system: ~/prog_dev/LibreOffice/file_conversion/inp $ uname -a Linux evansl-Inspiron-531 3.2.0-57-generic #87-Ubuntu SMP Tue Nov 12 21:35:10 UTC 2013 x86_64 x86_64 x86_64 GNU/Linux ~/prog_dev/LibreOffice/file_conversion/inp $ and saving as f1040.fodg did not preserve the field types. IOW, the checkboxes in the .pdf were coded as: lt;draw:polygon draw:style-name=gr5 draw:layer=layout svg:width=0.281cm svg:height=0.281cm svg:x=4.642cm svg:y=7.267cm svg:viewBox=0 0 282 282 draw:points=0,282 282,282 282,0 0,0gt; lt;text:p/gt; lt;/draw:polygongt; lt;draw:frame draw:style-name=gr45 draw:layer=layout svg:width=0.273cm svg:height=0.336cm svg:x=4.161cm svg:y=7.264cmgt; lt;draw:text-boxgt; lt;text:p text:style-name=P1gt;lt;text:span text:style-name=T13gt;2 lt;/text:spangt;lt;/text:pgt; lt;/draw:text-boxgt; lt;/draw:framegt; lt;draw:frame draw:style-name=gr47 draw:layer=layout svg:width=7.249cm svg:height=0.336cm svg:x=5.08cm svg:y=7.27cmgt; lt;draw:text-boxgt; lt;text:p text:style-name=P1gt;lt;text:span text:style-name=T7gt;Married filing jointly (even if only one had income) lt;/text:spangt;lt;/text:pgt; lt;/draw:text-boxgt; lt;/draw:framegt; which gives no indication its a checkbox of any sort. The same is true of text fields because the First Name and intial field is coded as: lt;draw:frame draw:style-name=gr176 draw:layer=layout svg:width=3.922cm svg:height=0.336cm svg:x=1.34cm svg:y=3.05cmgt; lt;draw:text-boxgt; lt;text:p text:style-name=P1gt;lt;text:span text:style-name=T25gt;YourFirstNameAndInitiallt;/text:spangt;lt;/text:pgt; lt;/draw:text-boxgt; lt;/draw:framegt; Are there any plans to actually convert the fields into some form of xform fields which are currently available in LibreOffice writer: https://help.libreoffice.org/Common/XML_Form_Documents_XForms ? TIA. -regards, Larry Evans ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54514] PRINT PREVIEW: Old icon for page left
https://bugs.freedesktop.org/show_bug.cgi?id=54514 --- Comment #29 from Mihovil Stanic [:Mikeyy - L10n HR] mihovil.sta...@gmail.com --- Yes it's still here. 4.1.4.2 Windows 7 Open new calc document and click Print Preview. If you are using Tango theme, first icon from left, icon for Previous page will be different from Next page icon. You can find screenshot in comment 21. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unotbl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bb562304c1e1c61a882e6db65806cfdf8601bcbf
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Dec 27 20:46:50 2013 +0100
Related: fdo#65090 Fix crash in SwXTextTableCursor::mergeRange()
Regression from b844f06b36cf9a6c1411861a08701c8f9be2af0d (fdo#48692: fix
problems with large number of table cells, 2012-09-21), the problem was
that GetSelectedBoxesCount() may return 0, and if that happens, the
prefix decrement operator set nCount to 0x, which then
resulted in a call to DeleteBox(), which did not happen before.
Thanks debug STL for pointing out this issue.
Change-Id: I9eee55f642726343c4ce9af479ccd2c4dde03b6a
diff --git a/sw/source/core/unocore/unotbl.cxx
b/sw/source/core/unocore/unotbl.cxx
index fad3242..9702a50 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1720,7 +1720,7 @@ sal_Bool SwXTextTableCursor::mergeRange(void) throw(
uno::RuntimeException )
if(bRet)
{
size_t nCount = pTblCrsr-GetSelectedBoxesCount();
-while (--nCount)
+while (nCount--)
{
pTblCrsr-DeleteBox(nCount);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: OpenDocument text (Flat XML) .fodt
On 27-12-2013 16:00, John Robson wrote: I always work with other friends using Github, the .fodt is very, very useful. Many thanks for creating that. can you also share WHY you do think it's usefull? I would like to suggest just to break lines more often. Some lines has more than 5000 columns!!! I yust did have a look at an .fodt file (i did not know this format), and i do not think that breaking up lines is a good thing within that format, because it's XML. If you want shorter 'lines' in this XML, than you should write shorter sentences ;) What about break a line each 80 columns?! This will help a lot the versioning systems and also when you need fix merges. Thank you again and Happy New Year to everybody. John ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/fdo65090.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 10 +++
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 43 ++-
writerfilter/source/dmapper/DomainMapperTableHandler.hxx | 17 +
writerfilter/source/dmapper/DomainMapperTableManager.cxx |8 ++
writerfilter/source/dmapper/PropertyIds.cxx |1
writerfilter/source/dmapper/PropertyIds.hxx |1
7 files changed, 77 insertions(+), 3 deletions(-)
New commits:
commit 97dcf77841d19d344d58d5bdacdab141cdea4817
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Dec 27 21:07:43 2013 +0100
Related: fdo#65090 DOCX import: handle w:hMerge cell property
Change-Id: I82f334426715fd1a1f0105b86f763d41e66f32da
diff --git a/sw/qa/extras/ooxmlimport/data/fdo65090.docx
b/sw/qa/extras/ooxmlimport/data/fdo65090.docx
new file mode 100644
index 000..4d45737
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo65090.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index e91de29..7804340 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1660,6 +1660,16 @@ DECLARE_OOXMLIMPORT_TEST(testRPrChangeClosed,
rprchange_closed.docx)
CPPUNIT_ASSERT_EQUAL(false, hasProperty(getRun(getParagraph(2), 1),
RedlineType));
}
+DECLARE_OOXMLIMPORT_TEST(testFdo65090, fdo65090.docx)
+{
+uno::Referencetext::XTextTablesSupplier xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTablesSupplier-getTextTables( ), uno::UNO_QUERY);
+uno::Referencetext::XTextTable xTextTable(xTables-getByIndex(0),
uno::UNO_QUERY);
+uno::Referencetable::XTableRows xTableRows(xTextTable-getRows(),
uno::UNO_QUERY);
+// The first row had two cells, instead of a single horizontally merged
one.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty
uno::Sequencetext::TableColumnSeparator (xTableRows-getByIndex(0),
TableColumnSeparators).getLength());
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index a098472..7e248de 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -539,7 +539,7 @@ TableStyleSheetEntry *
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
#define CNF_LAST_ROW_LAST_COLUMN0x002
#define CNF_LAST_ROW_FIRST_COLUMN 0x001
-CellPropertyValuesSeq_t
DomainMapperTableHandler::endTableGetCellProperties(TableInfo rInfo)
+CellPropertyValuesSeq_t
DomainMapperTableHandler::endTableGetCellProperties(TableInfo rInfo,
std::vectorHorizontallyMergedCell rMerges)
{
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
dmapper_logger-startElement(getCellProperties);
@@ -699,6 +699,25 @@ CellPropertyValuesSeq_t
DomainMapperTableHandler::endTableGetCellProperties(Tabl
aCellIterator-get()-Insert( PROP_BOTTOM_BORDER_DISTANCE,
uno::makeAny((sal_Int32)
rInfo.nBottomBorderDistance ) );
+// Horizontal merge is not an UNO property, extract that info
here to rMerges, and then remove it from the map.
+const PropertyMap::const_iterator aHorizontalMergeIter =
aCellIterator-get()-find(PROP_HORIZONTAL_MERGE);
+if (aHorizontalMergeIter != aCellIterator-get()-end())
+{
+if
(aHorizontalMergeIter-second.getValue().getsal_Bool())
+{
+// first cell in a merge
+HorizontallyMergedCell aMerge(nRow, nCell);
+rMerges.push_back(aMerge);
+}
+else if (!rMerges.empty())
+{
+// resuming an earlier merge
+HorizontallyMergedCell rMerge = rMerges.back();
+rMerge.m_nLastRow = nRow;
+rMerge.m_nLastCol = nCell;
+}
+aCellIterator-get()-erase(PROP_HORIZONTAL_MERGE);
+}
pSingleCellProperties[nCell] =
aCellIterator-get()-GetPropertyValues();
#ifdef DEBUG_DMAPPER_TABLE_HANDLER
dmapper_logger-endElement();
@@ -816,7 +835,8 @@ void DomainMapperTableHandler::endTable(unsigned int
nestedTableLevel)
aTableInfo.pTableStyle = endTableGetTableStyle(aTableInfo,
aFrameProperties);
// expands to uno::Sequence Sequence beans::PropertyValues
-CellPropertyValuesSeq_t aCellProperties =
endTableGetCellProperties(aTableInfo);
+std::vectorHorizontallyMergedCell aMerges;
+CellPropertyValuesSeq_t aCellProperties =
endTableGetCellProperties(aTableInfo, aMerges);
RowPropertyValuesSeq_t
[Libreoffice-commits] core.git: 2 commits - chart2/AllLangResTarget_chartcontroller.mk chart2/source helpcontent2
chart2/AllLangResTarget_chartcontroller.mk |1
chart2/source/controller/dialogs/dlg_InsertLegend.cxx | 10 -
chart2/source/controller/dialogs/res_LegendPosition.hxx | 79
--
chart2/source/controller/dialogs/tp_ErrorBars.cxx |5
chart2/source/controller/dialogs/tp_ErrorBars.hxx |1
chart2/source/controller/dialogs/tp_ErrorBars.src | 32
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx |7
chart2/source/controller/inc/HelpIds.hrc| 10 -
chart2/source/controller/inc/dlg_InsertLegend.hxx |9 -
chart2/source/controller/inc/res_LegendPosition.hxx | 79
++
helpcontent2|2
11 files changed, 89 insertions(+), 146 deletions(-)
New commits:
commit 27eb33d753eedfa4215eaf8325bc0ee9baeb7417
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 27 20:22:31 2013 +
remove unnecessary empty dtor, etc.
Change-Id: Ia2a1d1fe81a07d1e37437539d6d651a7c6ce
diff --git a/chart2/AllLangResTarget_chartcontroller.mk
b/chart2/AllLangResTarget_chartcontroller.mk
index f09bfb6..d742981 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -49,7 +49,6 @@ $(eval $(call
gb_SrsTarget_add_nonlocalizable_files,chart2/res,\
chart2/source/controller/dialogs/dlg_CreationWizard.src \
chart2/source/controller/dialogs/dlg_InsertDataLabel.src \
chart2/source/controller/dialogs/dlg_InsertErrorBars.src \
-chart2/source/controller/dialogs/tp_ErrorBars.src \
chart2/source/controller/dialogs/tp_PointGeometry.src \
chart2/source/controller/menus/ShapeContextMenu.src \
chart2/source/controller/menus/ShapeEditContextMenu.src \
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index 5d1f0f4..8362239 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -29,22 +29,18 @@ SchLegendDlg::SchLegendDlg(Window* pWindow, const
uno::Reference uno::XComponen
: ModalDialog(pWindow
,dlg_InsertLegend
,modules/schart/ui/dlg_InsertLegend.ui)
-, m_apLegendPositionResources( new LegendPositionResources(*this,xCC) )
-{
-}
-
-SchLegendDlg::~SchLegendDlg()
+, m_xLegendPositionResources( new LegendPositionResources(*this,xCC) )
{
}
void SchLegendDlg::init( const uno::Reference frame::XModel xChartModel )
{
-m_apLegendPositionResources-writeToResources( xChartModel );
+m_xLegendPositionResources-writeToResources( xChartModel );
}
bool SchLegendDlg::writeToModel( const uno::Reference frame::XModel
xChartModel ) const
{
-m_apLegendPositionResources-writeToModel( xChartModel );
+m_xLegendPositionResources-writeToModel( xChartModel );
return true;
}
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index 995babd..7b6743d 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -38,11 +38,6 @@ ErrorBarsTabPage::ErrorBarsTabPage( Window* pParent, const
SfxItemSet rInAttrs
pParent-GetParentDialog(),
rInAttrs, /* bNoneAvailable = */ false )
{
-// FreeResource();
-}
-
-ErrorBarsTabPage::~ErrorBarsTabPage()
-{
}
SfxTabPage* ErrorBarsTabPage::Create(
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
index 81a0417..a1bb2ae 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -30,7 +30,6 @@ class ErrorBarsTabPage : public SfxTabPage
{
public:
ErrorBarsTabPage ( Window* pParent, const SfxItemSet rInAttrs );
-virtual ~ErrorBarsTabPage ();
void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth );
void SetErrorBarType( ErrorBarResources::tErrorBarType eNewType );
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.src
b/chart2/source/controller/dialogs/tp_ErrorBars.src
deleted file mode 100644
index 78e6a12..000
--- a/chart2/source/controller/dialogs/tp_ErrorBars.src
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |8 source/text/schart/01/0405.xhp | 60 + 2 files changed, 16 insertions(+), 52 deletions(-) New commits: commit 8d6c8428de7fe8735640118179c5676c6b7f4f3e Author: Caolán McNamara caol...@redhat.com Date: Fri Dec 27 20:41:38 2013 + update help ids for error bar .ui conversion Change-Id: I3d99fa5f16de028086f0bf3089d2420b6406282c diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index ae272f4..f181e72 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3034,24 +3034,16 @@ HID_SCH_STATISTIK_CONSTERROR,63350, HID_SCH_STATISTIK_FUNCTION,63382, HID_SCH_STATISTIK_FUNCTION_LB,63384, HID_SCH_STATISTIK_MEANVALUE,63344, -HID_SCH_STATISTIK_MINUS_VALUE,63354, HID_SCH_STATISTIK_NEGATIVE_RANGE,63389, HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER,63390, HID_SCH_STATISTIK_NEGATIVE_VALUE,63388, HID_SCH_STATISTIK_NO_ERROR,63345, HID_SCH_STATISTIK_PERCENT,63348, HID_SCH_STATISTIK_PERCENT_VALUE,63351, -HID_SCH_STATISTIK_PLUS_VALUE,63353, HID_SCH_STATISTIK_POSITIVE_RANGE,63386, HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER,63387, HID_SCH_STATISTIK_POSITIVE_VALUE,63385, HID_SCH_STATISTIK_RANGE,63383, -HID_SCH_STATISTIK_SAME_FOR_BOTH,63391, -HID_SCH_STATISTIK_SHOW_BOTH,63392, -HID_SCH_STATISTIK_SHOW_NEGATIVE,63394, -HID_SCH_STATISTIK_SHOW_POSITIVE,63393, -HID_SCH_STATISTIK_SIGMA,63347, -HID_SCH_STATISTIK_VARIANT,63346, HID_SCH_TBI_DATA_DELETE_COL,63306, HID_SCH_TBI_DATA_DELETE_ROW,63305, HID_SCH_TBI_DATA_INSERT_COL,63304, diff --git a/source/text/schart/01/0405.xhp b/source/text/schart/01/0405.xhp index bf9865e..7c181e5 100644 --- a/source/text/schart/01/0405.xhp +++ b/source/text/schart/01/0405.xhp @@ -28,6 +28,8 @@ /meta body bookmark xml-lang=en-US branch=hid/.uno:InsertMenuYErrorBars id=bm_id877101 localize=false/ +bookmark xml-lang=en-US branch=hid/.uno:InsertMenuXErrorBars id=bm_id877102 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_ErrorBars/tp_ErrorBars id=bm_id877102 localize=false/ paragraph role=heading id=hd_id3147428 xml-lang=en-US level=1 l10n=CHG oldref=1link href=text/schart/01/0405.xhp name=Y Error BarsX/Y Error Bars/link/paragraphcommenti85330/comment paragraph role=paragraph id=par_id3149666 xml-lang=en-US l10n=CHG oldref=2variable id=statistikahelp hid=.Use the emphX or Y Error Bars/emph dialog to display error bars for 2D charts./ahelp /variable/paragraph @@ -39,80 +41,50 @@ paragraph role=note id=par_id3153965 xml-lang=en-US l10n=CHG oldref=23The emphInsert - X/Y Error Bars/emph menu command is only available for 2D charts./paragraph paragraph role=heading id=hd_id3150344 xml-lang=en-US level=2 l10n=U oldref=5Error category/paragraph paragraph role=paragraph id=par_id3150202 xml-lang=en-US l10n=CHG oldref=6In the emphError category/emph area, you can choose different ways to display the error category./paragraph -!-- removed HID SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_NONE -- -!-- removed HID SCH:RADIOBUTTON:TP_STAT:RBT_NONE -- bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_STATISTIK_NO_ERROR id=bm_id3862117 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_ErrorBars/RB_NONE id=bm_id3862118 localize=false/ paragraph role=heading id=hd_id3152989 xml-lang=en-US level=3 l10n=CHG oldref=7None/paragraph -paragraph role=paragraph id=par_id3149409 xml-lang=en-US l10n=CHG oldref=8ahelp hid=SCH:RADIOBUTTON:TP_STAT:RBT_NONEDoes not show any error bars./ahelp/paragraph -!-- removed HID SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_CONST -- -!-- removed HID SCH:METRICFIELD:DLG_DATA_STAT:MTR_FLD_PLUS -- -!-- removed HID SCH:METRICFIELD:DLG_DATA_STAT:MTR_FLD_MINUS -- -!-- removed HID SCH:RADIOBUTTON:TP_STAT:RBT_CONST -- -!-- removed HID SCH:METRICFIELD:TP_STAT:MTR_FLD_PLUS -- -!-- removed HID SCH:METRICFIELD:TP_STAT:MTR_FLD_MINUS -- +paragraph role=paragraph id=par_id3149409 xml-lang=en-US l10n=CHG oldref=8ahelp hid=modules/schart/ui/tp_ErrorBars/RB_NONEDoes not show any error bars./ahelp/paragraph bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_STATISTIK_CONSTERROR id=bm_id3964964 localize=false/ -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_STATISTIK_PLUS_VALUE id=bm_id5771965 localize=false/ -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_STATISTIK_MINUS_VALUE id=bm_id1989196 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_ErrorBars/RB_CONST id=bm_id3964966 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_ErrorBars/MF_POSITIVE id=bm_id3964961 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_ErrorBars/MF_NEGATIVE id=bm_id3964963 localize=false/ paragraph role=heading id=hd_id3145117 xml-lang=en-US level=3 l10n=U oldref=17Constant value/paragraph -paragraph role=paragraph id=par_id3151390 xml-lang=en-US l10n=CHG oldref=18ahelp hid=SCH:METRICFIELD:TP_STAT:MTR_FLD_MINUSDisplays constant values that you
[Libreoffice-commits] core.git: sd/source sd/uiconfig sd/UIConfig_sdraw.mk
sd/UIConfig_sdraw.mk |1
sd/source/ui/app/strings.src |4 --
sd/source/ui/inc/strings.hrc |2 -
sd/source/ui/view/drviews6.cxx |9 ++
sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui | 35 +
5 files changed, 40 insertions(+), 11 deletions(-)
New commits:
commit 6cbccc8efa49dbf4ff21cabbfb9e74059d67b170
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date: Thu Dec 26 13:16:51 2013 +0300
convert unlink image querybox to .ui
Change-Id: I46458d497757162be283effb624a7c769aeb5354
Reviewed-on: https://gerrit.libreoffice.org/7200
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index 5f8ce22..cb2c84b 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
sd/uiconfig/sdraw/ui/namedesign \
sd/uiconfig/sdraw/ui/paranumberingtab \
sd/uiconfig/sdraw/ui/printeroptions \
+ sd/uiconfig/sdraw/ui/queryunlinkimagedialog \
sd/uiconfig/sdraw/ui/tabledesigndialog \
sd/uiconfig/sdraw/ui/vectorize \
))
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index b7f916c..b8b5237 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -798,10 +798,6 @@ String STR_FILEFORMAT_NAME
{
Text [ en-US ] = File name without extension ;
};
-String STR_RELEASE_GRAPHICLINK
-{
-Text [ en-US ] = This image is linked to a document. Do you want to
unlink the image in order to edit it? ;
-};
String STR_NEW_CUSTOMSHOW
{
Text [ en-US ] = New Custom Slide Show ;
diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc
index 819d31d..dcc6042 100644
--- a/sd/source/ui/inc/strings.hrc
+++ b/sd/source/ui/inc/strings.hrc
@@ -284,8 +284,6 @@
#define STR_FILEFORMAT_PATH (RID_APP_START+509)
#define STR_FILEFORMAT_NAME (RID_APP_START+510)
-#define STR_RELEASE_GRAPHICLINK (RID_APP_START+511)
-
#define STR_NEW_CUSTOMSHOW (RID_APP_START+512)
#define STR_COPY_CUSTOMSHOW (RID_APP_START+513)
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 6aa6238..14f7e6c 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -301,19 +301,18 @@ void DrawViewShell::ExecBmpMask( SfxRequest rReq )
if ( pObj !mpDrawView-IsTextEdit() )
{
SdrGrafObj* pNewObj = (SdrGrafObj*) pObj-Clone();
-sal_BoolbCont = sal_True;
+bool bCont = true;
if( pNewObj-IsLinkedGraphic() )
{
-QueryBox aQBox( (Window*) GetActiveWindow(), WB_YES_NO |
WB_DEF_YES,
-SD_RESSTR( STR_RELEASE_GRAPHICLINK ) );
+MessageDialog aQueryBox( (Window*)
GetActiveWindow(),QueryUnlinkImageDialog,modules/sdraw/ui/queryunlinkimagedialog.ui);
-if( RET_YES == aQBox.Execute() )
+if (RET_YES == aQueryBox.Execute())
pNewObj-ReleaseGraphicLink();
else
{
delete pNewObj;
-bCont = sal_False;
+bCont = false;
}
}
diff --git a/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui
b/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui
new file mode 100644
index 000..c372e2b
--- /dev/null
+++ b/sd/uiconfig/sdraw/ui/queryunlinkimagedialog.ui
@@ -0,0 +1,35 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+ !-- interface-requires gtk+ 3.0 --
+ object class=GtkMessageDialog id=QueryUnlinkImageDialog
+property name=can_focusFalse/property
+property name=border_width12/property
+property name=title translatable=yesRelease image's link?/property
+property name=resizableFalse/property
+property name=type_hintdialog/property
+property name=skip_taskbar_hintTrue/property
+property name=message_typequestion/property
+property name=buttonsyes-no/property
+property name=text translatable=yesThis image is linked to a
document./property
+property name=secondary_text translatable=yes Do you want to unlink
the image in order to edit it?/property
+child internal-child=vbox
+ object class=GtkBox id=messagedialog-vbox4
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing24/property
+child internal-child=action_area
+ object class=GtkButtonBox id=messagedialog-action_area4
+property name=can_focusFalse/property
+property name=layout_styleend/property
+ /object
+ packing
+
[Libreoffice-commits] core.git: svx/source svx/uiconfig svx/UIConfig_svx.mk
svx/UIConfig_svx.mk |2
svx/source/dialog/imapdlg.cxx | 11 +---
svx/source/dialog/imapdlg.hrc |7 --
svx/source/dialog/imapdlg.src |9 ---
svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui | 52
svx/uiconfig/ui/querysaveimagemapchangesdialog.ui | 52
6 files changed, 111 insertions(+), 22 deletions(-)
New commits:
commit 4c26083959637ffa9ca8bc1eed99f3c218447123
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date: Thu Dec 26 15:11:57 2013 +0300
convert save and modify imageMaps queryboxes to .ui
Change-Id: I222ce47187e46f7de9916bd559846d28c30d4562
Reviewed-on: https://gerrit.libreoffice.org/7201
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index f2a8087..e82509c 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -28,8 +28,10 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/optgridpage \
svx/uiconfig/ui/passwd \
svx/uiconfig/ui/querydeletecontourdialog \
+ svx/uiconfig/ui/querymodifyimagemapchangesdialog \
svx/uiconfig/ui/querynewcontourdialog \
svx/uiconfig/ui/querysavecontchangesdialog \
+ svx/uiconfig/ui/querysaveimagemapchangesdialog \
svx/uiconfig/ui/queryunlinkgraphicsdialog \
svx/uiconfig/ui/redlinecontrol \
svx/uiconfig/ui/redlinefilterpage \
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 8c1b46f..3cc0bb63 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -40,6 +40,7 @@
#include sfx2/docfile.hxx
#include unotools/localedatawrapper.hxx
#include comphelper/processfactory.hxx
+#include vcl/layout.hxx
#define _IMAPDLG_PRIVATE
#include svx/imapdlg.hxx
@@ -225,8 +226,7 @@ sal_Bool SvxIMapDlg::Close()
if ( aTbxIMapDlg1.IsItemEnabled( TBI_APPLY ) )
{
-QueryBoxaQBox( this, WB_YES_NO_CANCEL | WB_DEF_YES,
- SVX_RESSTR( STR_IMAPDLG_MODIFY ) );
+MessageDialog aQBox(
this,QueryModifyImageMapChangesDialog,svx/ui/querymodifyimagemapchangesdialog.ui);
const long nRet = aQBox.Execute();
if( nRet == RET_YES )
@@ -240,8 +240,7 @@ sal_Bool SvxIMapDlg::Close()
}
else if( pIMapWnd-IsChanged() )
{
-QueryBoxaQBox( this, WB_YES_NO_CANCEL | WB_DEF_YES,
- SVX_RESSTR( STR_IMAPDLG_SAVE ) );
+MessageDialog aQBox(
this,QuerySaveImageMapChangesDialog,svx/ui/querysaveimagemapchangesdialog.ui);
const long nRet = aQBox.Execute();
if( nRet == RET_YES )
@@ -727,8 +726,8 @@ IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl)
if ( pOwnData-pUpdateEditingObject != pCheckObj )
{
if ( pIMapWnd-IsChanged()
- ( QueryBox( this, WB_YES_NO | WB_DEF_YES,
- SVX_RESSTR( STR_IMAPDLG_SAVE ) ).Execute() == RET_YES ) )
+ ( MessageDialog( this,QuerySaveImageMapChangesDialog,
+ svx/ui/querysaveimagemapchangesdialog.ui ).Execute() == RET_YES
) )
{
DoSave();
}
diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc
index 40ba35b..bcc2569 100644
--- a/svx/source/dialog/imapdlg.hrc
+++ b/svx/source/dialog/imapdlg.hrc
@@ -86,11 +86,4 @@
/**/
-
-#define STR_IMAPDLG_SAVE(RID_SVX_IMAPDLG_START + 5)
-#define STR_IMAPDLG_MODIFY (RID_SVX_IMAPDLG_START + 6)
-
-
-/**/
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src
index 730ef28..486217a 100644
--- a/svx/source/dialog/imapdlg.src
+++ b/svx/source/dialog/imapdlg.src
@@ -344,14 +344,5 @@ Menu RID_SVXMN_IMAP
/**/
-String STR_IMAPDLG_SAVE
-{
-Text [ en-US ] = The ImageMap has been modified.\nDo you want to save the
changes?;
-};
-
-String STR_IMAPDLG_MODIFY
-{
-Text [ en-US ] = The ImageMap has been modified.\nDo you want to save the
changes? ;
-};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui
b/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui
new file mode 100644
index 000..33e388e
--- /dev/null
+++ b/svx/uiconfig/ui/querymodifyimagemapchangesdialog.ui
@@ -0,0 +1,52 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+ !-- interface-requires gtk+ 3.0 --
+ object class=GtkMessageDialog id=QueryModifyImageMapChangesDialog
+property name=can_focusFalse/property
+property name=border_width12/property
+property name=title translatable=yesSave ImageMap
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ecf04f88654c4eac0fd19f4869d72b43e553bbca Author: Caolán McNamara caol...@redhat.com Date: Fri Dec 27 21:46:44 2013 + Updated core Project: help 3ff9e57722620dc1752b4e2990893f3606eb3af7 diff --git a/helpcontent2 b/helpcontent2 index 8d6c842..3ff9e57 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8d6c8428de7fe8735640118179c5676c6b7f4f3e +Subproject commit 3ff9e57722620dc1752b4e2990893f3606eb3af7 ___ 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 | 12 source/text/schart/01/0403.xhp | 22 -- 2 files changed, 12 insertions(+), 22 deletions(-) New commits: commit 3ff9e57722620dc1752b4e2990893f3606eb3af7 Author: Caolán McNamara caol...@redhat.com Date: Fri Dec 27 21:46:44 2013 + update help ids for data label dialog .ui conversion Change-Id: If0fd69825526696190f411881887c7d22c5e323f diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index f181e72..b626344 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3006,15 +3006,6 @@ HID_SCH_CTL_DATA,63290, HID_SCH_CTL_TYPE,63293, HID_SCH_CTL_VARIANT,63294, HID_SCH_CT_INDICATE,63291, -HID_SCH_DATALABEL_NUMBER,63356, -HID_SCH_DATALABEL_PERCENT,63357, -HID_SCH_DATALABEL_PLACEMENT,63371, -HID_SCH_DATALABEL_ROTATION_EDIT,63399, -HID_SCH_DATALABEL_ROTATION_KNOB,63398, -HID_SCH_DATALABEL_SEPARATOR,63370, -HID_SCH_DATALABEL_SYMBOL,63359, -HID_SCH_DATALABEL_TEXT,63358, -HID_SCH_DATALABEL_VALUE,63355, HID_SCH_DATA_RANGES_LIST,63296, HID_SCH_DATA_SERIES_LABEL,63367, HID_SCH_DLG_RANGES,63327, @@ -3025,8 +3016,6 @@ HID_SCH_LEGEND_POS_RIGHT,63342, HID_SCH_LEGEND_POS_TOP,63341, HID_SCH_LEGEND_SHOW,63366, HID_SCH_NUM_OF_LINES,63323, -HID_SCH_PB_NUMBERFORMAT,63368, -HID_SCH_PB_PERCENT_NUMBERFORMAT,63369, HID_SCH_SERIES_LIST,63295, HID_SCH_STATISTIK_BIGERROR,63349, HID_SCH_STATISTIK_BIGERROR_VALUE,63352, @@ -3051,7 +3040,6 @@ HID_SCH_TBI_DATA_INSERT_ROW,63303, HID_SCH_TBI_DATA_SWAP_COL,63307, HID_SCH_TBI_DATA_SWAP_ROW,63308, HID_SCH_TBX_DATA,63314, -HID_SCH_TEXTDIRECTION,63395, HID_SCH_TEXTDIRECTION_EQUATION,63397, HID_SCH_TITLE_X,63362, HID_SCH_TITLE_Y,63363, diff --git a/source/text/schart/01/0403.xhp b/source/text/schart/01/0403.xhp index 8e8f4c4..b5977f8 100644 --- a/source/text/schart/01/0403.xhp +++ b/source/text/schart/01/0403.xhp @@ -35,6 +35,7 @@ /bookmark bookmark xml-lang=en-US branch=hid/.uno:InsertMenuDataLabels id=bm_id3144510 localize=false/ bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_DataLabel/tp_DataLabel id=bm_id3144511 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/dlg_DataLabel/dlg_DataLabels id=bm_id3144511 localize=false/ section id=datalabels paragraph xml-lang=en-US id=hd_id3150275 role=heading level=1 l10n=U oldref=1variable id=datenbeschriftunglink href=text/schart/01/0403.xhp name=Data labelsData Labels/link /variable/paragraph @@ -48,50 +49,51 @@ embed href=text/schart/00/0004.xhp#efgdbs/ /section bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_DataLabel/CB_VALUE_AS_NUMBER id=bm_id901517 localize=false/ -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_DATALABEL_VALUE id=bm_id8825342 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/dlg_DataLabel/CB_VALUE_AS_NUMBER id=bm_id8825342 localize=false/ paragraph xml-lang=en-US id=hd_id3149401 role=heading level=2 l10n=CHG oldref=17Show value as number/paragraph paragraph xml-lang=en-US id=par_id3150751 role=paragraph l10n=U oldref=18ahelp hid=modules/schart/ui/tp_DataLabel/CB_VALUE_AS_NUMBERDisplays the absolute values of the data points./ahelp/paragraph bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_DataLabel/PB_NUMBERFORMAT id=bm_id1717276 localize=false/ -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_PB_NUMBERFORMAT id=bm_id1717277 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/dlg_DataLabel/PB_NUMBERFORMAT id=bm_id1717277 localize=false/ paragraph xml-lang=en-US id=hd_id5077059 role=heading level=2 l10n=NEWNumber format/paragraph paragraph xml-lang=en-US id=par_id9794610 role=paragraph l10n=NEWahelp hid=.Opens a dialog to select the number format./ahelp/paragraph bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_DataLabel/CB_VALUE_AS_PERCENTAGE id=bm_id9111912 localize=false/ -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_DATALABEL_PERCENT id=bm_id9111911 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/dlg_DataLabel/CB_VALUE_AS_PERCENTAGE id=bm_id9111911 localize=false/ paragraph xml-lang=en-US id=hd_id3145643 role=heading level=2 l10n=CHG oldref=9Show value as percentage/paragraph paragraph xml-lang=en-US id=par_id3156382 role=paragraph l10n=U oldref=10ahelp hid=modules/schart/ui/tp_DataLabel/CB_VALUE_AS_PERCENTAGEDisplays the percentage of the data points in each column./ahelp/paragraph bookmark xml-lang=en-US branch=hid/modules/schart/ui/tp_DataLabel/PB_PERCENT_NUMBERFORMAT id=bm_id381482 localize=false/ -bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_PB_PERCENT_NUMBERFORMAT id=bm_id381481 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/schart/ui/dlg_DataLabel/PB_PERCENT_NUMBERFORMAT id=bm_id381481 localize=false/ paragraph xml-lang=en-US id=hd_id1316873 role=heading level=2 l10n=NEWPercentage format/paragraph
[Libreoffice-commits] core.git: 2 commits - include/svx svx/source
include/svx/fmresids.hrc |2
include/svx/imapdlg.hxx | 34 --
svx/source/dialog/imapdlg.cxx |9 --
svx/source/form/datanavi.src | 134 --
svx/source/inc/datanavi.hrc | 16 -
5 files changed, 17 insertions(+), 178 deletions(-)
New commits:
commit 2e359fbb18286d0f300c0267a188d82769d276de
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 27 21:52:30 2013 +
drop converted RID_SVXDLG_ADD_SUBMISSION
Change-Id: Ice586c1dbe9adf52cdf8aa2b1a3fda8308f9da1e
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index 3991dd3..437294f 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -65,8 +65,6 @@
#define RID_SVXDLG_ADD_CONDITION(RID_FORMS_START + 13)
#define RID_SVXDLG_NAMESPACE_ITEM (RID_FORMS_START + 14)
-#define RID_SVXDLG_ADD_SUBMISSION (RID_FORMS_START + 16)
-
#define RID_SVXWIN_DATANAVIGATOR(RID_FORMS_START + 19)
#define RID_SVX_XFORMS_TABPAGES (RID_FORMS_START + 20)
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 98255db..5b3f9aa 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -708,140 +708,6 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM
};
};
-ModalDialog RID_SVXDLG_ADD_SUBMISSION
-{
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 180 , 136 ) ;
-Text [ en-US ] = Add Submission ;
-Moveable = TRUE ;
-FixedLine FL_SUBMISSION
-{
-Pos = MAP_APPFONT ( 4 , 3 ) ;
-Size = MAP_APPFONT ( 172 , 8 ) ;
-Text [ en-US ] = Submission ;
-};
-FixedText FT_SUBMIT_NAME
-{
-Pos = MAP_APPFONT ( 6 , 16 ) ;
-Size = MAP_APPFONT ( 69 , 8 ) ;
-LeftLabel = TRUE ;
-Text [ en-US ] = ~Name ;
-};
-Edit ED_SUBMIT_NAME
-{
-HelpID = svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_NAME;
-Pos = MAP_APPFONT ( 78 , 14 ) ;
-Size = MAP_APPFONT ( 96 , 12 ) ;
-Border = TRUE ;
-};
-FixedText FT_SUBMIT_ACTION
-{
-Pos = MAP_APPFONT ( 6 , 31 ) ;
-Size = MAP_APPFONT ( 69 , 8 ) ;
-LeftLabel = TRUE ;
-Text [ en-US ] = ~Action ;
-};
-Edit ED_SUBMIT_ACTION
-{
-HelpID = svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_ACTION;
-Pos = MAP_APPFONT ( 78 , 29 ) ;
-Size = MAP_APPFONT ( 96 , 12 ) ;
-Border = TRUE ;
-};
-FixedText FT_SUBMIT_METHOD
-{
-Pos = MAP_APPFONT ( 6 , 46 ) ;
-Size = MAP_APPFONT ( 69 , 8 ) ;
-LeftLabel = TRUE ;
-Text [ en-US ] = ~Method ;
-};
-ListBox LB_SUBMIT_METHOD
-{
-HelpID = svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_METHOD;
-Pos = MAP_APPFONT ( 78 , 44 ) ;
-Size = MAP_APPFONT ( 96 , 51 ) ;
-Border = TRUE ;
-DropDown = TRUE;
-};
-FixedText FT_SUBMIT_REF
-{
-Pos = MAP_APPFONT ( 6 , 62 ) ;
-Size = MAP_APPFONT ( 69 , 8 ) ;
-LeftLabel = TRUE ;
-Text [ en-US ] = Binding e~xpression ;
-};
-Edit ED_SUBMIT_REF
-{
-HelpID = svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_REF;
-Pos = MAP_APPFONT ( 78 , 60 ) ;
-Size = MAP_APPFONT ( 79, 12 ) ;
-Border = TRUE ;
-};
-PushButton PB_SUBMIT_REF
-{
-HelpID = svx:PushButton:RID_SVXDLG_ADD_SUBMISSION:PB_SUBMIT_REF;
-Pos = MAP_APPFONT ( 159 , 59 ) ;
-Size = MAP_APPFONT ( 14 , 14 ) ;
-TabStop = TRUE ;
-Text [ en-US ] = ~... ;
-};
-FixedText FT_SUBMIT_BIND
-{
-Pos = MAP_APPFONT ( 6 , 77 ) ;
-Size = MAP_APPFONT ( 69 , 8 ) ;
-LeftLabel = TRUE ;
-Text [ en-US ] = ~Binding ;
-};
-ListBox LB_SUBMIT_BIND
-{
-HelpID = svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_BIND;
-Pos = MAP_APPFONT ( 78 , 75 ) ;
-Size = MAP_APPFONT ( 96 , 51 ) ;
-Border = TRUE ;
-DropDown = TRUE;
-};
-FixedText FT_SUBMIT_REPLACE
-{
-Pos = MAP_APPFONT ( 6 , 92 ) ;
-Size = MAP_APPFONT ( 69 , 8 ) ;
-LeftLabel = TRUE ;
-Text [ en-US ] = ~Replace ;
-};
-ListBox LB_SUBMIT_REPLACE
-{
-HelpID = svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_REPLACE;
-Pos = MAP_APPFONT ( 78 , 90 ) ;
-Size = MAP_APPFONT ( 96 , 51 ) ;
-Border = TRUE ;
-DropDown = TRUE;
-};
-FixedLine FL_DATANAV_BTN
-{
-Pos = MAP_APPFONT ( 4 , 105 ) ;
-Size = MAP_APPFONT ( 172 , 8 ) ;
-};
-OKButton BTN_DATANAV_OK
-{
-Pos = MAP_APPFONT ( 15 , 116 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-TabStop = TRUE ;
-DefButton = TRUE ;
-};
-CancelButton BTN_DATANAV_ESC
-{
-Pos = MAP_APPFONT ( 68 , 116 ) ;
-Size = MAP_APPFONT ( 50 , 14 ) ;
-
[Libreoffice-commits] core.git: sc/qa sc/source
sc/qa/unit/ucalc.cxx | 41 +
sc/qa/unit/ucalc.hxx |2 ++
sc/source/core/data/column.cxx | 11 +++
3 files changed, 50 insertions(+), 4 deletions(-)
New commits:
commit 21f053e2dd2867489a4d5823d9210c4368f4d115
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Dec 27 17:33:52 2013 -0500
fdo#72874: Strip const-ness from pointer value when setting it to storage.
Else the pointer type would get demoted to a boolean type which would cause
the boolean version of overloaded function to get picked.
Change-Id: Ided7e8c67ef84b4323c8ad1123e0a2c30ce37e01
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 2f7e52c..17c4123 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4106,6 +4106,47 @@ void Test::testSortWithFormulaRefs()
pDoc-DeleteTab(1);
}
+void Test::testSortWithStrings()
+{
+m_pDoc-InsertTab(0, Test);
+
+ScFieldEditEngine rEE = m_pDoc-GetEditEngine();
+rEE.SetText(Val1);
+m_pDoc-SetString(ScAddress(1,1,0), Header);
+m_pDoc-SetString(ScAddress(1,2,0), Val2);
+m_pDoc-SetEditText(ScAddress(1,3,0), rEE.CreateTextObject());
+
+CPPUNIT_ASSERT_EQUAL(OUString(Header),
m_pDoc-GetString(ScAddress(1,1,0)));
+CPPUNIT_ASSERT_EQUAL(OUString(Val2),
m_pDoc-GetString(ScAddress(1,2,0)));
+CPPUNIT_ASSERT_EQUAL(OUString(Val1),
m_pDoc-GetString(ScAddress(1,3,0)));
+
+ScSortParam aParam;
+aParam.nCol1 = 1;
+aParam.nCol2 = 1;
+aParam.nRow1 = 1;
+aParam.nRow2 = 3;
+aParam.bHasHeader = true;
+aParam.maKeyState[0].bDoSort = true;
+aParam.maKeyState[0].bAscending = true;
+aParam.maKeyState[0].nField = 1;
+
+m_pDoc-Sort(0, aParam, false, NULL);
+
+CPPUNIT_ASSERT_EQUAL(OUString(Header),
m_pDoc-GetString(ScAddress(1,1,0)));
+CPPUNIT_ASSERT_EQUAL(OUString(Val1),
m_pDoc-GetString(ScAddress(1,2,0)));
+CPPUNIT_ASSERT_EQUAL(OUString(Val2),
m_pDoc-GetString(ScAddress(1,3,0)));
+
+aParam.maKeyState[0].bAscending = false;
+
+m_pDoc-Sort(0, aParam, false, NULL);
+
+CPPUNIT_ASSERT_EQUAL(OUString(Header),
m_pDoc-GetString(ScAddress(1,1,0)));
+CPPUNIT_ASSERT_EQUAL(OUString(Val2),
m_pDoc-GetString(ScAddress(1,2,0)));
+CPPUNIT_ASSERT_EQUAL(OUString(Val1),
m_pDoc-GetString(ScAddress(1,3,0)));
+
+m_pDoc-DeleteTab(0);
+}
+
void Test::testSort()
{
OUString aTabName1(test1);
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 2af0e65..771a044 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -275,6 +275,7 @@ public:
void testFindAreaPosColRight();
void testSort();
void testSortWithFormulaRefs();
+void testSortWithStrings();
void testShiftCells();
void testNoteDeleteRow();
void testNoteDeleteCol();
@@ -385,6 +386,7 @@ public:
CPPUNIT_TEST(testFindAreaPosColRight);
CPPUNIT_TEST(testSort);
CPPUNIT_TEST(testSortWithFormulaRefs);
+CPPUNIT_TEST(testSortWithStrings);
CPPUNIT_TEST(testShiftCells);
CPPUNIT_TEST(testNoteDeleteRow);
CPPUNIT_TEST(testNoteDeleteCol);
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index a8f4d91..921ff25 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -916,7 +916,8 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
break;
case CELLTYPE_EDIT:
{
-it1 = maCells.set(it1, nRow1, aCell2.mpEditText);
+it1 = maCells.set(
+it1, nRow1,
const_castEditTextObject*(aCell2.mpEditText));
EditTextObject* p;
maCells.release(it1, nRow2, p);
}
@@ -999,7 +1000,8 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
break;
case CELLTYPE_EDIT:
{
-it1 = maCells.set(it1, nRow1, aCell2.mpEditText);
+it1 = maCells.set(
+it1, nRow1,
const_castEditTextObject*(aCell2.mpEditText));
EditTextObject* p;
it1 = maCells.release(it1, nRow2, p);
}
@@ -1031,7 +1033,8 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
break;
case CELLTYPE_EDIT:
{
-it1 = maCells.set(it1, nRow1, aCell2.mpEditText);
+it1 = maCells.set(
+it1, nRow1,
const_castEditTextObject*(aCell2.mpEditText));
EditTextObject* p;
it1 = maCells.release(it1, nRow2, p); // prevent it being
overwritten.
}
@@ -1079,7 +1082,7 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
;
}
-maCells.set(it1, nRow2, aCell1.mpEditText);
+maCells.set(it1, nRow2,
const_castEditTextObject*(aCell1.mpEditText));
}
break;
case
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/qa sc/source
sc/qa/unit/ucalc.cxx | 41 +
sc/qa/unit/ucalc.hxx |2 ++
sc/source/core/data/column.cxx | 11 +++
3 files changed, 50 insertions(+), 4 deletions(-)
New commits:
commit dbd8709af0545b0372c28c5ff36effba68bca580
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Dec 27 17:33:52 2013 -0500
fdo#72874: Strip const-ness from pointer value when setting it to storage.
Else the pointer type would get demoted to a boolean type which would cause
the boolean version of overloaded function to get picked.
Change-Id: Ided7e8c67ef84b4323c8ad1123e0a2c30ce37e01
(cherry picked from commit 21f053e2dd2867489a4d5823d9210c4368f4d115)
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 107825b..2b04ea4 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4096,6 +4096,47 @@ void Test::testSortWithFormulaRefs()
pDoc-DeleteTab(1);
}
+void Test::testSortWithStrings()
+{
+m_pDoc-InsertTab(0, Test);
+
+ScFieldEditEngine rEE = m_pDoc-GetEditEngine();
+rEE.SetText(Val1);
+m_pDoc-SetString(ScAddress(1,1,0), Header);
+m_pDoc-SetString(ScAddress(1,2,0), Val2);
+m_pDoc-SetEditText(ScAddress(1,3,0), rEE.CreateTextObject());
+
+CPPUNIT_ASSERT_EQUAL(OUString(Header),
m_pDoc-GetString(ScAddress(1,1,0)));
+CPPUNIT_ASSERT_EQUAL(OUString(Val2),
m_pDoc-GetString(ScAddress(1,2,0)));
+CPPUNIT_ASSERT_EQUAL(OUString(Val1),
m_pDoc-GetString(ScAddress(1,3,0)));
+
+ScSortParam aParam;
+aParam.nCol1 = 1;
+aParam.nCol2 = 1;
+aParam.nRow1 = 1;
+aParam.nRow2 = 3;
+aParam.bHasHeader = true;
+aParam.maKeyState[0].bDoSort = true;
+aParam.maKeyState[0].bAscending = true;
+aParam.maKeyState[0].nField = 1;
+
+m_pDoc-Sort(0, aParam, false, NULL);
+
+CPPUNIT_ASSERT_EQUAL(OUString(Header),
m_pDoc-GetString(ScAddress(1,1,0)));
+CPPUNIT_ASSERT_EQUAL(OUString(Val1),
m_pDoc-GetString(ScAddress(1,2,0)));
+CPPUNIT_ASSERT_EQUAL(OUString(Val2),
m_pDoc-GetString(ScAddress(1,3,0)));
+
+aParam.maKeyState[0].bAscending = false;
+
+m_pDoc-Sort(0, aParam, false, NULL);
+
+CPPUNIT_ASSERT_EQUAL(OUString(Header),
m_pDoc-GetString(ScAddress(1,1,0)));
+CPPUNIT_ASSERT_EQUAL(OUString(Val2),
m_pDoc-GetString(ScAddress(1,2,0)));
+CPPUNIT_ASSERT_EQUAL(OUString(Val1),
m_pDoc-GetString(ScAddress(1,3,0)));
+
+m_pDoc-DeleteTab(0);
+}
+
void Test::testSort()
{
OUString aTabName1(test1);
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 1e2a483..b877e02 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -275,6 +275,7 @@ public:
void testFindAreaPosColRight();
void testSort();
void testSortWithFormulaRefs();
+void testSortWithStrings();
void testShiftCells();
void testNoteDeleteRow();
void testNoteDeleteCol();
@@ -384,6 +385,7 @@ public:
CPPUNIT_TEST(testFindAreaPosColRight);
CPPUNIT_TEST(testSort);
CPPUNIT_TEST(testSortWithFormulaRefs);
+CPPUNIT_TEST(testSortWithStrings);
CPPUNIT_TEST(testShiftCells);
CPPUNIT_TEST(testNoteDeleteRow);
CPPUNIT_TEST(testNoteDeleteCol);
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index a8f4d91..921ff25 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -916,7 +916,8 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
break;
case CELLTYPE_EDIT:
{
-it1 = maCells.set(it1, nRow1, aCell2.mpEditText);
+it1 = maCells.set(
+it1, nRow1,
const_castEditTextObject*(aCell2.mpEditText));
EditTextObject* p;
maCells.release(it1, nRow2, p);
}
@@ -999,7 +1000,8 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
break;
case CELLTYPE_EDIT:
{
-it1 = maCells.set(it1, nRow1, aCell2.mpEditText);
+it1 = maCells.set(
+it1, nRow1,
const_castEditTextObject*(aCell2.mpEditText));
EditTextObject* p;
it1 = maCells.release(it1, nRow2, p);
}
@@ -1031,7 +1033,8 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
break;
case CELLTYPE_EDIT:
{
-it1 = maCells.set(it1, nRow1, aCell2.mpEditText);
+it1 = maCells.set(
+it1, nRow1,
const_castEditTextObject*(aCell2.mpEditText));
EditTextObject* p;
it1 = maCells.release(it1, nRow2, p); // prevent it being
overwritten.
}
@@ -1079,7 +1082,7 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
;
}
-maCells.set(it1, nRow2, aCell1.mpEditText);
+maCells.set(it1, nRow2,
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 68220, which changed state. Bug 68220 Summary: EDITING: BUG: calc crashes on spell check https://bugs.freedesktop.org/show_bug.cgi?id=68220 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/uiconfig
chart2/uiconfig/ui/tp_ErrorBars.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5be7ec4193b892e5643ff5f3f2e6755319569190 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Fri Dec 27 21:40:31 2013 -0200 Put right icon in image button Change-Id: Ieed7b3cc0725b5d3341ed390035c55df8a8119e2 Reviewed-on: https://gerrit.libreoffice.org/7218 Reviewed-by: Olivier Hallot olivier.hal...@edx.srv.br Tested-by: Olivier Hallot olivier.hal...@edx.srv.br diff --git a/chart2/uiconfig/ui/tp_ErrorBars.ui b/chart2/uiconfig/ui/tp_ErrorBars.ui index ab84242..9f9243f 100644 --- a/chart2/uiconfig/ui/tp_ErrorBars.ui +++ b/chart2/uiconfig/ui/tp_ErrorBars.ui @@ -9,12 +9,12 @@ object class=GtkImage id=imageRANGE_SELECT_POSITIVE property name=visibleTrue/property property name=can_focusFalse/property -property name=pixbufformula/res/refinp1.png/property +property name=pixbufchart2/res/selectrange.png/property /object object class=GtkImage id=imageRANGE_SELECT_NEG property name=visibleTrue/property property name=can_focusFalse/property -property name=pixbufformula/res/refinp1.png/property +property name=pixbufchart2/res/selectrange.png/property /object object class=GtkListStore id=liststoreFUNCTION columns ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl2' - chart2/inc chart2/source
chart2/inc/ChartView.hxx|2 +
chart2/source/view/inc/AbstractShapeFactory.hxx |5 +++
chart2/source/view/inc/DummyXShape.hxx |9 +
chart2/source/view/inc/OpenglShapeFactory.hxx |2 +
chart2/source/view/inc/ShapeFactory.hxx |5 +++
chart2/source/view/main/ChartView.cxx | 39
chart2/source/view/main/DummyXShape.cxx | 14
chart2/source/view/main/OpenglShapeFactory.cxx |7
8 files changed, 65 insertions(+), 18 deletions(-)
New commits:
commit 857d8e91e714e03a4c6de7757462fb8a206ae664
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sat Dec 28 07:21:34 2013 +0100
make it easier to draw with all properties
Change-Id: Ia563f703d5bc622f9577fee177b4f558c100be87
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 2731d2d..80ef459 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -202,6 +202,8 @@ private: //member
m_xShapeFactory;
::com::sun::star::uno::Reference ::com::sun::star::drawing::XDrawPage
m_xDrawPage;
+::com::sun::star::uno::Reference ::com::sun::star::drawing::XShapes
+mxRootShape;
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
m_xDashTable;
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
m_xGradientTable;
diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx
b/chart2/source/view/inc/AbstractShapeFactory.hxx
index e9726c2..b0bf8f4 100644
--- a/chart2/source/view/inc/AbstractShapeFactory.hxx
+++ b/chart2/source/view/inc/AbstractShapeFactory.hxx
@@ -236,6 +236,11 @@ public:
virtual void setPageSize( com::sun::star::uno::Reference
com::sun::star::drawing::XShapes xChartShapes, const
com::sun::star::awt::Size rSize ) = 0;
+/**
+ * Only necessary for stateless implementations
+ */
+virtual void render(com::sun::star::uno::Reference
com::sun::star::drawing::XShapes xRootShape) = 0;
+
virtual void createSeries( const com::sun::star::uno::Reference
com::sun::star::drawing::XShapes xTarget,
diff --git a/chart2/source/view/inc/DummyXShape.hxx
b/chart2/source/view/inc/DummyXShape.hxx
index e68c5b8..915b5aa 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -174,7 +174,13 @@ public:
virtual ::com::sun::star::uno::Sequence OUString SAL_CALL
getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString ServiceName )
throw (::com::sun::star::uno::RuntimeException);
+// normal non UNO methods
+
virtual DummyChart* getRootShape();
+/**
+ * Implement this method for all subclasses that should be rendered
+ */
+virtual void render();
protected:
@@ -393,6 +399,9 @@ public:
virtual sal_Int32 SAL_CALL getCount()
throw(::com::sun::star::uno::RuntimeException) ;
virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index )
throw(::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
+// normal methods
+virtual void render();
+
private:
std::vectorcom::sun::star::uno::Reference
com::sun::star::drawing::XShape maUNOShapes;
std::vectorDummyXShape* maShapes;
diff --git a/chart2/source/view/inc/OpenglShapeFactory.hxx
b/chart2/source/view/inc/OpenglShapeFactory.hxx
index be4d01d..f4f6160 100644
--- a/chart2/source/view/inc/OpenglShapeFactory.hxx
+++ b/chart2/source/view/inc/OpenglShapeFactory.hxx
@@ -190,6 +190,8 @@ public:
::com::sun::star::drawing::XDrawPage xPage );
virtual void setPageSize( com::sun::star::uno::Reference
com::sun::star::drawing::XShapes xChartShapes, const
com::sun::star::awt::Size rSize );
+
+virtual void render(com::sun::star::uno::Reference
com::sun::star::drawing::XShapes xRootShape) SAL_OVERRIDE;
private:
void *m_pChart;
diff --git a/chart2/source/view/inc/ShapeFactory.hxx
b/chart2/source/view/inc/ShapeFactory.hxx
index c23e13e..614b13f 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -205,6 +205,11 @@ public:
virtual void setPageSize( com::sun::star::uno::Reference
com::sun::star::drawing::XShapes xChartShapes, const
com::sun::star::awt::Size rSize );
+/**
+ * not necessary right now
+ */
+virtual void render(com::sun::star::uno::Reference
com::sun::star::drawing::XShapes ) SAL_OVERRIDE {}
+
private:
ShapeFactory();
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index f501aa9..9a2a949 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2390,8 +2390,8 @@ void ChartView::createShapes()
awt::Size aPageSize =
[no subject]
We are looking for a developer who is familiar with the code of Libreoffice or OpenOffice. Also if you are one of the developer or contributors We need to do some customization for the code and we will pay per hour ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
looking for a developer for Libreoffice (hourly rate)
We are looking for a developer who is familiar with the code of Libreoffice or OpenOffice. Also if you are one of the developer or contributors We need to do some customization for the code and we will pay per hour thanks ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2013-12-28
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things ! + Convert insert error bars dialog to widget UI in https://gerrit.libreoffice.org/7219 from Olivier Hallot about module chart2 + fdo#69613: Code changes for TOC with flag '\z' should get preserved after in https://gerrit.libreoffice.org/7217 from Yogesh Bharate about module sw, writerfilter + fdo#73034: Fix for Extra spacing in document. in https://gerrit.libreoffice.org/7216 from Rohit Deshmukh about module sw + fdo#72520 : Exporting sheet external data for chart for docx files. in https://gerrit.libreoffice.org/7215 from Sushil Shinde about module chart2, include, oox + fdo#72520 : Preserving external data path in chart import. in https://gerrit.libreoffice.org/7214 from Sushil Shinde about module include, oox + fdo#72520 : Exporting embedding data folder from grab bag. in https://gerrit.libreoffice.org/7213 from Sushil Shinde about module sw + fdo#72520 : Added property to store external data path in chart. in https://gerrit.libreoffice.org/7212 from Sushil Shinde about module chart2, include, offapi, oox, xmloff + fdo#72520 : Added embedded data of docx file to InteropGrabBag. in https://gerrit.libreoffice.org/7211 from Sushil Shinde about module writerfilter + fdo#73046 DOCX For anchor tag relativeHeight attribute should be always p in https://gerrit.libreoffice.org/7208 from Nikhil Walvekar about module sw + fdo#69613: Fix for DOCX Export loses Table-of-Contents flags in https://gerrit.libreoffice.org/7203 from Tushar Bende about module sw + fdo#69613:Fix for '\o' flag field should export once. in https://gerrit.libreoffice.org/7206 from Priyanka Gaikwad about module sw End of freshness * Merged changes on master for project core changed in the last 25 hours: + Put right icon in image button in https://gerrit.libreoffice.org/7218 from Olivier Hallot + convert save and modify imageMaps queryboxes to .ui in https://gerrit.libreoffice.org/7201 from Manal Alhassoun + convert unlink image querybox to .ui in https://gerrit.libreoffice.org/7200 from Manal Alhassoun + Convert chart data label dialog to widget UI in https://gerrit.libreoffice.org/7205 from Olivier Hallot + Convert chart error bars tab page to widget UI in https://gerrit.libreoffice.org/7198 from Olivier Hallot + Convert chart legend dialog to widget UI in https://gerrit.libreoffice.org/7199 from Olivier Hallot + Convert chart polar options tab page to widget UI in https://gerrit.libreoffice.org/7193 from Olivier Hallot * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fix previous commit in https://gerrit.libreoffice.org/7101 from Markus Mohrhard + CID#736173: Out-of-bound read in https://gerrit.libreoffice.org/6973 from Julien Nabet + move from ActionBarSherlock to corresponding android support lib in https://gerrit.libreoffice.org/7082 from Christian Lohmaier + fdo#60698: Merge animcore into sd and slideshow in https://gerrit.libreoffice.org/7108 from Marcos Souza + sdremote: show notes also in landscape orientation in https://gerrit.libreoffice.org/6889 from Christian Lohmaier + fix Bluetooth lifecycle problems and respect UI guidelines in https://gerrit.libreoffice.org/7083 from Christian Lohmaier + get rid of custom all-caps ui widget in https://gerrit.libreoffice.org/6903 from Christian Lohmaier + Double toolbar icon size for HiDPI screens. in https://gerrit.libreoffice.org/6994 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + Code clean-up/consolidation task. in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + new cell-border handling in calc in https://gerrit.libreoffice.org/6093 from Viktor Varga + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in
[Libreoffice-bugs] [Bug 72432] Other: While displaying the startcenter, the name of the last opened document still appears in the task bar
https://bugs.freedesktop.org/show_bug.cgi?id=72432 --- Comment #7 from Papipio pitho...@free.fr --- Bonjour, It seems that with LO 4.2.0.0.beta2 the problem does not occur. But, as it is random Pierre -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73059] New: EDITING: Forms - columns could not be hidden in a tablecontrol while editing a form
https://bugs.freedesktop.org/show_bug.cgi?id=73059 Priority: medium Bug ID: 73059 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: Forms - columns could not be hidden in a tablecontrol while editing a form Severity: normal Classification: Unclassified OS: All Reporter: rob...@familiegrosskopf.de Hardware: Other Status: NEW Version: 3.6.0.0.beta1 Component: Database Product: LibreOffice Created attachment 91209 -- https://bugs.freedesktop.org/attachment.cgi?id=91209action=edit Form with a tablecontrol. Try to hide a column while editing the form. Open the attached database. Open the form for editing. Try to hide a column of the tablecontrol with the context-menue of the mouse. There isn't any possibility for hiding a column while editing a form. This possibility has been gone since LO 3.6. Tested it with 3.0.0.0beta1 as the first version I have installed. With LO 3.5.7.2 and all other earlier versions this works. Note: This bug appears at the same time as bug54021. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 54021] EDITING: Fields in tablecontrols of a form could not be moved/sorted
https://bugs.freedesktop.org/show_bug.cgi?id=54021 rob...@familiegrosskopf.de changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=73059 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73059] EDITING: Forms - columns could not be hidden in a tablecontrol while editing a form
https://bugs.freedesktop.org/show_bug.cgi?id=73059 rob...@familiegrosskopf.de changed: What|Removed |Added See Also||https://bugs.freedesktop.or ||g/show_bug.cgi?id=54021 Keywords||regression -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73059] EDITING: Forms - columns could not be hidden in a tablecontrol while editing a form
https://bugs.freedesktop.org/show_bug.cgi?id=73059 rob...@familiegrosskopf.de changed: What|Removed |Added Hardware|Other |x86-64 (AMD64) OS|All |Linux (All) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73059] EDITING: Forms - columns could not be hidden in a tablecontrol while editing a form
https://bugs.freedesktop.org/show_bug.cgi?id=73059 --- Comment #1 from rob...@familiegrosskopf.de --- Created attachment 91210 -- https://bugs.freedesktop.org/attachment.cgi?id=91210action=edit Hide columns while editing a form is possible up to LO 3.5 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73059] EDITING: Forms - columns could not be hidden in a tablecontrol while editing a form
https://bugs.freedesktop.org/show_bug.cgi?id=73059 --- Comment #2 from rob...@familiegrosskopf.de --- Created attachment 91211 -- https://bugs.freedesktop.org/attachment.cgi?id=91211action=edit Hide columns while editing a form is not possible since LO 3.6 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73059] EDITING: Forms - columns could not be hidden in a tablecontrol while editing a form
https://bugs.freedesktop.org/show_bug.cgi?id=73059 rob...@familiegrosskopf.de changed: What|Removed |Added Attachment #91209|text/plain |application/vnd.oasis.opend mime type||ocument.base -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71423] Impress frequently crashes when editing tables in slides
https://bugs.freedesktop.org/show_bug.cgi?id=71423 --- Comment #21 from choffardet pierre.choffar...@free.fr --- I did all my test with a fresh profiles. anyway LO must not crash whatever you profile is I did not told that the bug were fixed in LO 4.2 branch. As said before, it is difficult it reproduce the bug. maybe I was simply lucky this time If the bug has disappear accidental, it can be back bay the same way I will do new test soon on 4.2.0 RC1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72945] L10n UI French Custom install does not list user interface languages in alphabetical order
https://bugs.freedesktop.org/show_bug.cgi?id=72945 Andras Timar tima...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED Assignee|libreoffice-b...@lists.free |tima...@gmail.com |desktop.org | --- Comment #1 from Andras Timar tima...@gmail.com --- Regression occurred, because the subtree of program modules were removed. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48767] Page orientation is not saved/loaded in/from .xlsx format
https://bugs.freedesktop.org/show_bug.cgi?id=48767 suokunl...@gmail.com changed: What|Removed |Added CC||suokunl...@gmail.com --- Comment #5 from suokunl...@gmail.com --- Tested in LibreOffice 4.1.4.2 and 4.2.0.1: 1. New spreadsheet, input something； 2. Set page to landscape; 2. Save as ms-office-2007/2010 (.xlsx); 3. Load in LibreOffice, page is Landscape; 4. Load in MSO 2010, page is Portrait So: LO knows the page is Landscape, but MSO dont know it. Further testing: 5. Set the page as Landscape in MSO, save. 6. Open in LibreOffice, page is Landscape. 7. Do some editing, save, and load in MSO, page is Portrait again. So, LO exported the wrong page orientation info in xlsx. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48767] Page orientation is not saved/loaded in/from .xlsx format
https://bugs.freedesktop.org/show_bug.cgi?id=48767 --- Comment #6 from suokunl...@gmail.com --- (In reply to comment #5) Tested in LibreOffice 4.1.4.2 and 4.2.0.1: 2. Save as ms-office-2007/2010 (.xlsx); unzip the xlsx file saved by LibreOffice, I found the following in /xl/worksheets/sheet1.xml: pageSetup blackAndWhite=false cellComments=none copies=1 draft=false firstPageNumber=1 fitToHeight=1 fitToWidth=1 horizontalDpi=300 orientation=landscape pageOrder=downThenOver paperSize=9 scale=100 useFirstPageNumber=true usePrinterDefaults=false verticalDpi=300/ Further testing: 5. Set the page as Landscape in MSO, save. unzip the xlsx file save by MSO, I found the following in /xl/worksheets/sheet1.xml: pageSetup paperSize=9 orientation=landscape useFirstPageNumber=1 horizontalDpi=300 verticalDpi=300 r:id=rId1/ They are all orientation=landscape, except that xlsx save by LO is much bigger (have more xml attributes). So why is it portrait when load in MSO? A MSO bug? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48767] Page orientation is not saved/loaded in/from .xlsx format
https://bugs.freedesktop.org/show_bug.cgi?id=48767 --- Comment #7 from suokunl...@gmail.com --- Created attachment 91212 -- https://bugs.freedesktop.org/attachment.cgi?id=91212action=edit xlsx file saved by LO 4.1.4.2. the page should be landscape, but appears portrait when loaded in MSO 2010. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48767] Page orientation is not saved/loaded in/from .xlsx format
https://bugs.freedesktop.org/show_bug.cgi?id=48767 --- Comment #8 from suokunl...@gmail.com --- Created attachment 91213 -- https://bugs.freedesktop.org/attachment.cgi?id=91213action=edit xlsx file saved by MSO 2010 the page is landscape when loaded in LO or MSO. But when edited by LO and save, it's portrait again when loaded in MSO. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55087] [Usability] Module specific UI preferences
https://bugs.freedesktop.org/show_bug.cgi?id=55087 Heiko Tietze heiko.tie...@user-prompt.com changed: What|Removed |Added Status|NEEDINFO|UNCONFIRMED Ever confirmed|1 |0 --- Comment #3 from Heiko Tietze heiko.tie...@user-prompt.com --- There is not much to say about repro. Just open the navigator toolbar (aka document structure) in Writer per F5 or the like and dock the frame to the left side. Close writer, open Impress and you will get the navigator frame left hand (along with the slides frame which is more relevant here). Undock and close the frame - and it is gone in writer too. My advice is to make the UI configuration persistent for all modules individually. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 63553] Cross-references are broken, when copied to other document or part of the document
https://bugs.freedesktop.org/show_bug.cgi?id=63553 --- Comment #5 from Cor Nouws c...@nouenoff.nl --- Hi Andis, the version field is to show the _FIRST_ version with the problem. Do you know if that was from 3.5.x to 3.6.x ? (I hope to do some testing soon and will set the field accordingly) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73062] New: VIEWING: Crash after closing full-screen window
https://bugs.freedesktop.org/show_bug.cgi?id=73062 Priority: medium Bug ID: 73062 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: VIEWING: Crash after closing full-screen window Severity: normal Classification: Unclassified OS: Mac OS X (All) Reporter: pj...@guineapics.de Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.0.1 rc Component: Writer Product: LibreOffice Created attachment 91214 -- https://bugs.freedesktop.org/attachment.cgi?id=91214action=edit Crash Dump Problem description: Steps to reproduce: 1. Open Document 2. Switch to MacOSX full-screen mode 3. Open new document window using window-new window 4. close the new document window 5. switch back to the original document window Current behavior: libreoffice crashes Expected behavior: libreoffice doesn't crash Operating System: Mac OS X Version: 4.2.0.1 rc -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 57734] Implement non-vulnerable IMAGING FILTERS for embedded PICTURES (in Writer etc.)
https://bugs.freedesktop.org/show_bug.cgi?id=57734 A stgohi-lob...@yahoo.de changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from A stgohi-lob...@yahoo.de --- I think it would be good to have some at least basic features to change pictures like the mentioned brightness. In LO we have already a few features like rotating, mirroring and cutting, but more features would be good. Regarding the Edit with External Tool option it would be good to have the option to choose the tool from a list of available tools in order to edit the picture. reproducible with LO 4.1.4.2 (Win7 Home, 64bit) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73056] Non-global Table Row Margins of MS WORD 97-2003 DOC are only implemented for 1st Cell of Row.
https://bugs.freedesktop.org/show_bug.cgi?id=73056 --- Comment #1 from Jeroen Hennekes jeroen.henne...@gmail.com --- In my description: Replace above margin by TOP MARGIN Replace below margin by BOTTOM MARGIN In LibreOffice margins are inspected by following: 1. Select a table cell (not only the cell text, but the whole cell) 2. Choose Table... (Menu or Rightmouse click) 3. Choose Table Properties 4. Choose Borders tab: Spacing to contents - Left Right Top Bottom When you select the table header row in the provided example in LibreOffice Writer, you will find Spacing to contents = 0,00 0,00 0,00 0,00 cm, because the 3 Cells have different TOP/BOTTOM margins: 1st cell is correct: 0,15 0,15 0,10 0,10 cm (equals MS WORD margins) 2nd and 3d cell are incorrect: 0,15 0,15 0,15 0,45 cm (MS WORD cell margins 0,15 0,15 0,10 0,10 are not imported. Standard table cell margins get used instead) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73063] New: FILESAVE: LibreOffice Calc does not remeber locale settings when saving as .xls
https://bugs.freedesktop.org/show_bug.cgi?id=73063 Priority: medium Bug ID: 73063 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE: LibreOffice Calc does not remeber locale settings when saving as .xls Severity: normal Classification: Unclassified OS: Linux (All) Reporter: boriv...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.4.2 release Component: Spreadsheet Product: LibreOffice Problem description: Steps to reproduce: 1. Set the cell value as DATE and choose non-default (non-English) language (Serbian) 2. Save file as .xls 3. Reopen the file. Current behavior: Locale is restored to default (English-US) Expected behavior: Preserve the intended formatting. Operating System: Ubuntu Version: 4.1.4.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 61387] FILESAVE: Font size gets lost when saving as pptx file
https://bugs.freedesktop.org/show_bug.cgi?id=61387 --- Comment #3 from A stgohi-lob...@yahoo.de --- still reproducible with LO 4.1.4.2 (Win7 Home, 64bit) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 56045] Data-Labels- and Axis-Number-FORMATTING needs Complete Recalculation for update
https://bugs.freedesktop.org/show_bug.cgi?id=56045 --- Comment #7 from A stgohi-lob...@yahoo.de --- still reproducible with LO 4.1.4.2 (Win7 Home, 64bit) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73065] New: The Movie and Sound object should have media controls
https://bugs.freedesktop.org/show_bug.cgi?id=73065 Priority: medium Bug ID: 73065 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: The Movie and Sound object should have media controls Severity: enhancement Classification: Unclassified OS: All Reporter: freedesk...@alishomepage.com Hardware: All Status: UNCONFIRMED Version: 4.1.4.2 release Component: Presentation Product: LibreOffice Currently, when one uses the Movie and Sound object to insert audio or video into a presentation, it can be played back or paused in slideshow mode - but nothing more. Interesting features would be: * Buttons for play / pause / stop * Control for scrolling the audio / video forwards and backwards * Choosing a thumbnail for audio / poster frame for the video -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55216] FORMATTING: Function and Icon Background Colour/Color
https://bugs.freedesktop.org/show_bug.cgi?id=55216 --- Comment #3 from A stgohi-lob...@yahoo.de --- still reproducible with LO 4.1.4.2 (Win7 Home, 64bit) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 57341] Modal dialogs are a horrible user experience
https://bugs.freedesktop.org/show_bug.cgi?id=57341 --- Comment #3 from Mirek2 maz...@gmail.com --- Agreed with Dave. This is definitely something to think about and tackle. @Adolfo: iWork Pages has avoided most dialogs with its Inspector, and even Microsoft Office manages to cram most of its dialog functions into the ribbon, so I would say it's definitely possible. It's also not good for discoverability to spread features out among tons of UI elements. Ideally, we should have the toolbar for quick access and the sidebar for all properties. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72887] Save as RTF: Can't open with LibreOffice (File format error)
https://bugs.freedesktop.org/show_bug.cgi?id=72887
Andras Timar tima...@gmail.com changed:
What|Removed |Added
CC||vmik...@collabora.co.uk
--- Comment #2 from Andras Timar tima...@gmail.com ---
Unpaired curly brackets, {{\field }
--
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60948] More help about installation of UI languages
https://bugs.freedesktop.org/show_bug.cgi?id=60948 A stgohi-lob...@yahoo.de changed: What|Removed |Added CC||tima...@gmail.com --- Comment #5 from A stgohi-lob...@yahoo.de --- I would propose to reopen this issue. Reasons: 1. The LO Online Help is still showing a wrong entry with Adding More UI Languages with no information. 2. The LO Offline help still gives the user no hint how to install UI additional languages. If you are an experienced PC user then you probably of course know how to add an additional UI language on an already installed LibreOffice system (Windows Control Panel - change installation - select the languages). But not all users are that experienced and therefore it would be important from the ease of use point of view to give the user a hint how to install these additional languages. Are there any objections against reopening this issue? Reproducible with LO 4.1.4.2 (Win7 Home, 64bit) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72055] EDITING: Use a sensible color picker for drawings
https://bugs.freedesktop.org/show_bug.cgi?id=72055 --- Comment #5 from Mirek2 maz...@gmail.com --- The reason why that color picker is used is because the grid-based picker works for solid colors only (i.e. doesn't work for patterns, gradients, etc.). As an interim solution, would it be possible to use the grid-based picker when Color is selected and the list-based picker for gradients, hatchings, and bitmaps? BTW, the grid-based picker should always be used for the outline. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 58416] UI: Background of toolbars is too white
https://bugs.freedesktop.org/show_bug.cgi?id=58416 A stgohi-lob...@yahoo.de changed: What|Removed |Added Status|UNCONFIRMED |NEW Severity|minor |enhancement Ever confirmed|0 |1 --- Comment #5 from A stgohi-lob...@yahoo.de --- Maybe it is possible to find another UI proposal in the future besides the nice Personas Themes which a user can choose if wished and therefore I have marked it as an enhancement request. Reproducible with LO 4.1.4.2 (Win7 Home, 64bit) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73063] FILESAVE: LibreOffice Calc does not remember locale settings when saving as .xls
https://bugs.freedesktop.org/show_bug.cgi?id=73063 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Summary|FILESAVE: LibreOffice Calc |FILESAVE: LibreOffice Calc |does not remeber locale |does not remember locale |settings when saving as |settings when saving as |.xls|.xls -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 58810] Alternative dialog Find Replace for Writer: does not highlight first search result
https://bugs.freedesktop.org/show_bug.cgi?id=58810 A stgohi-lob...@yahoo.de changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #2 from A stgohi-lob...@yahoo.de --- For me not reproducible with LO 4.1.4.2 (Win7 Home, 64bit). All three hits are highlighted. @Rainer: Do this issue still occur for you with the latest release of LO? Otherwise, I would propose to close this issue. Can anybody else still confirm this bug? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 63553] Cross-references are broken, when copied to other document or part of the document
https://bugs.freedesktop.org/show_bug.cgi?id=63553 --- Comment #6 from andis.lazd...@gmail.com --- (In reply to comment #5) Hi Andis, the version field is to show the _FIRST_ version with the problem. Do you know if that was from 3.5.x to 3.6.x ? (I hope to do some testing soon and will set the field accordingly) I think it was introduced simultaneously into 3.5.5 and 3.6.x. I don't remember version of 3.6. I guess it was introduced together with some very welcome functions in the insert caption dialogue, like visible reference text for tables and graphics in cross-reference dialogue and solving of problem of non-standard captions, which didn't appeared at all or partially in 3.5-3.5.4 and in first versions of 3.6. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 58377] FORMATTING: Different spacing between currency symbol and number depending on cell containing number or formula
https://bugs.freedesktop.org/show_bug.cgi?id=58377 A stgohi-lob...@yahoo.de changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #4 from A stgohi-lob...@yahoo.de --- Not reproducible with LO 4.1.4.2 (Win7 Home, 64bit) I don't know if this bug still existed in LO's 3.6.x latest release, but because LO 3.6.x has already reached the End of Life status (no more updates) I would propose to close this issue. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66577] Cursor is sometimes misplaced when editing text on Mac OS X
https://bugs.freedesktop.org/show_bug.cgi?id=66577 --- Comment #34 from Cosmin Saveanu c.save...@laposte.net --- Created attachment 91221 -- https://bugs.freedesktop.org/attachment.cgi?id=91221action=edit Wrong cursor position in text (selection is highlighted) The problem disappears if I change the paragraph align to left instead of justified. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 66577] Cursor is sometimes misplaced when editing text on Mac OS X
https://bugs.freedesktop.org/show_bug.cgi?id=66577 --- Comment #35 from Cosmin Saveanu c.save...@laposte.net --- The title of this bug report looks accurate to me even if it might be not a single cause to the behaviour described by each and every user. Using LibreOffice 4.1.2.3 on Mac OS X 10.9 (but having the same issue previously on 10.6.8), I found the same extremely annoying behaviour of the cursor. It is sometimes displaced from the position where the actual editing happens. In the uploaded picture, the actual selected character is r but the selection is between r and the previous letter. The problem magically disappears if the I change the paragraph alignment from justified to left. Could it be that the display position and cursor position are not linked ? When text changes slightly due to a different alignment requirement for the paragraph, it looks like the cursor does not know about it... Please, please, some text positioning guru, notice this problem and help us with a solution! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73063] FILESAVE: LibreOffice Calc does not remember locale settings when saving as .xls
https://bugs.freedesktop.org/show_bug.cgi?id=73063 A stgohi-lob...@yahoo.de changed: What|Removed |Added OS|Linux (All) |All Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from A stgohi-lob...@yahoo.de --- reproducible with LO 4.1.4.2 (Win7 Home, 64bit), also reproducible with the xlsx file type, with the ods file type it works fine and the formatting is preserved -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 59975] EDITING: Enhancement request: Cell containing only decimal separator character becomes value 0 when paste cells range as unformatted text
https://bugs.freedesktop.org/show_bug.cgi?id=59975 A stgohi-lob...@yahoo.de changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||stgohi-lob...@yahoo.de Ever confirmed|0 |1 --- Comment #5 from A stgohi-lob...@yahoo.de --- Not reproducible with LO 4.1.4.2 (Win7 Home, 64bit) Can anybody still confirm this issue in the latest release of LO? Otherwise, I would propose to close this issue. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72731] VIEWING: Different display of formulas in libreoffice and exported pdf (win only)
https://bugs.freedesktop.org/show_bug.cgi?id=72731 --- Comment #7 from Jacques Guilleron guillero...@aol.com --- An easier way to show the problem, perhaps. In Writer, copy the next formula: f(t)=int from size*1.5 0 to 1 left[g(t')+sum from i=1 to N h_i(t')right] and send us a view of what is displayed. Kind regards, Jacques -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60976] RFE: Ability to add audio/video review comments, or insert audio/video/image in comments.
https://bugs.freedesktop.org/show_bug.cgi?id=60976 A stgohi-lob...@yahoo.de changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 --- Comment #1 from A stgohi-lob...@yahoo.de --- For me it seems to be a very interesting feature. Reproducible with LO 4.1.4.2 (Win7 Home, 64bit) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 61285] EDITING: Bad text rendering
https://bugs.freedesktop.org/show_bug.cgi?id=61285 A stgohi-lob...@yahoo.de changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 --- Comment #1 from A stgohi-lob...@yahoo.de --- Could you please give more information about the different steps to reproduce this issue. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73068] New: Other: Combo box dropdown target area is needlessly small
https://bugs.freedesktop.org/show_bug.cgi?id=73068 Priority: medium Bug ID: 73068 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Other: Combo box dropdown target area is needlessly small Severity: normal Classification: Unclassified OS: All Reporter: maz...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.4.2 release Component: UI Product: LibreOffice Created attachment 91225 -- https://bugs.freedesktop.org/attachment.cgi?id=91225action=edit Proposal explained Currently, to open the dropdown associated with a combo box, one has to click on the small arrow to the right of the combo box text field. Given that, in many cases (e.g. the font and style pickers), choosing from a list is more desirable than manual text entry, it'd be good if the target area for opening the dropdown was larger. Ideally, the dropdown list should open when clicking within the text field as well. This is currently the behavior in e.g. Google Docs. Operating System: All Version: 4.1.4.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 61435] FILEOPEN particular file types via link from other LibO installation causes runtime error
https://bugs.freedesktop.org/show_bug.cgi?id=61435 A stgohi-lob...@yahoo.de changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||stgohi-lob...@yahoo.de Ever confirmed|0 |1 --- Comment #1 from A stgohi-lob...@yahoo.de --- Because LO 3.6.x has already reached the End of Life status, do you have any objections against closing this issue to clean up the LO bugzilla report? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 61004] : Replace combo boxes in toolbars with dropdown buttons
https://bugs.freedesktop.org/show_bug.cgi?id=61004 --- Comment #3 from Mirek2 maz...@gmail.com --- (In reply to comment #2) Marking as NEEDINFO, just need to know if you've discussed this through the UX mailing thread. If not, I suggest doing this and letting the conversation determine the outcome. If they decide to move forward with the suggestion, we can mark this as NEW. Nevermind, see https://www.libreoffice.org/bugzilla/show_bug.cgi?id=73068 instead. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73069] New: VIEWING: Combo boxes don't look native
https://bugs.freedesktop.org/show_bug.cgi?id=73069 Priority: medium Bug ID: 73069 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: VIEWING: Combo boxes don't look native Severity: normal Classification: Unclassified OS: All Reporter: maz...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.1.4.2 release Component: UI Product: LibreOffice Created attachment 91226 -- https://bugs.freedesktop.org/attachment.cgi?id=91226action=edit Proposal explained on Gnome combo boxes Currently, the drop-down arrows in combo boxes appear as separate buttons. On Windows [1] and with some Linux themes, combo box arrows appear within the text field, not separated or barely separated from the rest of the text entry part of the field. My proposal would be to show the dropdown button inside the text entry field with no surrounding borders by default, unless specified differently for the platform. This would work well along with https://www.libreoffice.org/bugzilla/show_bug.cgi?id=73068, which would broaden the target area for opening dropdown and therefore eliminate the need for a clearly delineated dropdown button. [1] Windows combo boxes: http://msdn.microsoft.com/en-us/library/windows/desktop/bb775791%28v=vs.85%29.aspx Operating System: All Version: 4.1.4.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73068] Other: Combo box dropdown target area is needlessly small
https://bugs.freedesktop.org/show_bug.cgi?id=73068 --- Comment #1 from Mirek2 maz...@gmail.com --- *** Bug 69549 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69549] The target area for opening the drop-down list of a combo box is needlessly small
https://bugs.freedesktop.org/show_bug.cgi?id=69549 Mirek2 maz...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #2 from Mirek2 maz...@gmail.com --- *** This bug has been marked as a duplicate of bug 73068 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69549] The target area for opening the drop-down list of a combo box is needlessly small
https://bugs.freedesktop.org/show_bug.cgi?id=69549 --- Comment #3 from Mirek2 maz...@gmail.com --- (In reply to comment #1) could you please provide a screenshot of the combo box? See https://bugs.freedesktop.org/show_bug.cgi?id=73068 Forgot that I reported this bug (couldn't find it using Bugzilla search, when looking through my own reports, I accidentally kept the default status filters, which excludes Unconfirmed). -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 72998] significant custom shape import regression ...
https://bugs.freedesktop.org/show_bug.cgi?id=72998 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard||target:4.3.0 --- Comment #2 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Muthu Subramanian committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=beba4603ee8e603fff2599bee7f157d90872cb99 fdo#72998: Custom shapes have improper size. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
