[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Timur gti...@gmail.com changed: What|Removed |Added Depends on|53340 |34987 --- Comment #401 from Timur gti...@gmail.com --- Removing Bug 53340 as it was marked as a DUPLICATE of bug 34987, and adding the later. -- 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] .: android/sdremote
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java |
16 --
1 file changed, 7 insertions(+), 9 deletions(-)
New commits:
commit 74d2bcf697aeb631e927d8d87ea2ed5b96d816e6
Author: Michael Meeks michael.me...@suse.com
Date: Wed Jan 30 18:52:23 2013 +1100
fdo#60054 - sdremote - handle rotation without causing issues.
It seems there was a misunderstanding of onCreate's savedInstanceState cf.
http://developer.android.com/reference/android/app/Activity.html
Apparently we go through a onStop / onCreate cycle when rotating,
that triggered this.
Change-Id: I7cb1cf29bcae59ef26cf3bf0c2b3dd028eb8f878
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 5256f98..eb992f1 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -71,18 +71,16 @@ public class PresentationActivity extends
SherlockFragmentActivity {
//((FrameLayout) findViewById(R.id.framelayout)).addView(mLayout);
setContentView(R.layout.activity_presentation);
-if (savedInstanceState == null) {
-mPresentationFragment = new PresentationFragment();
+mPresentationFragment = new PresentationFragment();
-FragmentManager fragmentManager = getSupportFragmentManager();
+FragmentManager fragmentManager = getSupportFragmentManager();
-FragmentTransaction fragmentTransaction = fragmentManager
-.beginTransaction();
-fragmentTransaction.add(R.id.presentation_interceptor,
-mPresentationFragment, fragment_presentation);
-fragmentTransaction.commit();
-}
+FragmentTransaction fragmentTransaction = fragmentManager
+.beginTransaction();
+fragmentTransaction.add(R.id.presentation_interceptor,
+mPresentationFragment,
fragment_presentation);
+fragmentTransaction.commit();
mOuterLayout = (FrameLayout) findViewById(R.id.framelayout);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - android/sdremote
android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java |
16 --
1 file changed, 7 insertions(+), 9 deletions(-)
New commits:
commit 3353687fb4af77de2a5a901d58b940367162f741
Author: Michael Meeks michael.me...@suse.com
Date: Wed Jan 30 18:52:23 2013 +1100
fdo#60054 - sdremote - handle rotation without causing issues.
It seems there was a misunderstanding of onCreate's savedInstanceState cf.
http://developer.android.com/reference/android/app/Activity.html
Apparently we go through a onStop / onCreate cycle when rotating,
that triggered this.
Change-Id: I7cb1cf29bcae59ef26cf3bf0c2b3dd028eb8f878
(cherry picked from commit 74d2bcf697aeb631e927d8d87ea2ed5b96d816e6)
Signed-off-by: Thorsten Behrens tbehr...@suse.com
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
index 5256f98..eb992f1 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/PresentationActivity.java
@@ -71,18 +71,16 @@ public class PresentationActivity extends
SherlockFragmentActivity {
//((FrameLayout) findViewById(R.id.framelayout)).addView(mLayout);
setContentView(R.layout.activity_presentation);
-if (savedInstanceState == null) {
-mPresentationFragment = new PresentationFragment();
+mPresentationFragment = new PresentationFragment();
-FragmentManager fragmentManager = getSupportFragmentManager();
+FragmentManager fragmentManager = getSupportFragmentManager();
-FragmentTransaction fragmentTransaction = fragmentManager
-.beginTransaction();
-fragmentTransaction.add(R.id.presentation_interceptor,
-mPresentationFragment, fragment_presentation);
-fragmentTransaction.commit();
-}
+FragmentTransaction fragmentTransaction = fragmentManager
+.beginTransaction();
+fragmentTransaction.add(R.id.presentation_interceptor,
+mPresentationFragment,
fragment_presentation);
+fragmentTransaction.commit();
mOuterLayout = (FrameLayout) findViewById(R.id.framelayout);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |4 1 file changed, 4 insertions(+) New commits: commit 165387b4e714d87ee080add6e45bc47fcde8e556 Author: David Ostrovsky da...@ostrovsky.org Date: Tue Jan 29 20:35:45 2013 +0100 WITH_LANG: add en-US if it is missing Change-Id: Ie12913691fa3d01bc7ad2fc0c108821d0937d250 Reviewed-on: https://gerrit.libreoffice.org/1919 Tested-by: Miklos Vajna vmik...@suse.cz Reviewed-by: Miklos Vajna vmik...@suse.cz diff --git a/configure.ac b/configure.ac index a18eed4..d3a2a2c 100644 --- a/configure.ac +++ b/configure.ac @@ -11808,6 +11808,10 @@ for lang in $WITH_LANG; do AC_MSG_ERROR([invalid language: $lang; supported languages are: $ALL_LANGS]) fi done +if test -n $WITH_LANG -a $WITH_LANG != ALL; then +echo $WITH_LANG | grep -q en-US +test $? -ne 1 || WITH_LANG=`echo $WITH_LANG en-US` +fi # list with substituted ALL WITH_LANG_LIST=`echo $WITH_LANG | sed s/ALL/$ALL_LANGS/` test -z $WITH_LANG_LIST WITH_LANG_LIST=en-US ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 0bf978f138728de6d20fc76f671c6b353565eb0b
Author: Abdulaziz A Alayed aala...@kacst.edu.sa
Date: Tue Jan 22 11:43:30 2013 +0300
fdo#44582 fixing horizontal scroll bar in sub windows
Change-Id: Ifea57dec77c5b23771684a1e46267f8431478075
Reviewed-on: https://gerrit.libreoffice.org/1806
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/1908
Tested-by: Lior Kaplan kaplanl...@gmail.com
Reviewed-by: Miklos Vajna vmik...@suse.cz
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 736834a..e15fbfa 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1041,7 +1041,12 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(
ControlType nType,
rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1;
if (!rNativeContentRegion.GetHeight())
rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1;
-returnVal = sal_True;
+
+returnVal = true;
+
+//See fdo#44582, Horizontal scrollbar in navigator window is broken
+if ((nPart==PART_BUTTON_LEFT || nPart==PART_BUTTON_RIGHT)
Application::GetSettings().GetLayoutRTL())
+returnVal = false;
}
if( (nType == CTRL_MENUBAR) (nPart == PART_ENTIRE_CONTROL) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sfx2/source
sfx2/source/doc/templatedlg.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 14944defc38d3f515a9bd4e94f0d99f93e931aeb Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Mon Jan 28 18:50:39 2013 +0100 Template Manager: focus in search edit when clicking search action Change-Id: I91fa8463442d842ef9929a87fb22e5e1a0a869b5 Reviewed-on: https://gerrit.libreoffice.org/1916 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 908fca9..bf51e37 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -963,6 +963,8 @@ void SfxTemplateManagerDlg::OnTemplateSearch () mpSearchEdit-Show(!bVisible); mpSearchEdit-SetText(OUString()); +if (!bVisible) +mpSearchEdit-GrabFocus(); // display all templates if we hide the search bar if (bVisible mpCurView-isOverlayVisible()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/Rdb.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 161b43abb76a4180a7069d04ed251ad2108c9663 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Jan 30 09:44:24 2013 +0100 Apparent copy/paste typo Change-Id: Ie4986f36f7f71df64b1c7c7b5e0190f4d5708c64 diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk index e4df44c..bcaa3ff 100644 --- a/solenv/gbuild/Rdb.mk +++ b/solenv/gbuild/Rdb.mk @@ -60,7 +60,7 @@ $(call gb_Rdb_get_target,$(1)) : COMPONENTS := $(call gb_Rdb_get_clean_target,$(1)) : COMPONENTS := $(call gb_Rdb_get_outdir_target,$(1)) : $(call gb_Rdb_get_target,$(1)) \ | $(dir $(call gb_Rdb_get_outdir_target,$(1))).dir -$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_Rdb_get_target,$(1)),$(1)) +$(call gb_Deliver_add_deliverable,$(call gb_Rdb_get_outdir_target,$(1)),$(call gb_Rdb_get_target,$(1)),$(1)) $$(eval $$(call gb_Module_register_target,$(call gb_Rdb_get_outdir_target,$(1)),$(call gb_Rdb_get_clean_target,$(1 $(call gb_Helper_make_userfriendly_targets,$(1),Rdb) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Petr Mladek pmla...@suse.cz changed: What|Removed |Added Depends on||59916 --- Comment #94 from Petr Mladek pmla...@suse.cz --- Add bug 59916: calculation errors with localized Calc on some Linuxes. It afftects only some distros but it seems that it affects quite some people :-( -- 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] .: ios/Executable_Viewer.mk
ios/Executable_Viewer.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 9a39ae6d2d1eb1443bee95232c6b045d60f9052e Author: Tor Lillqvist t...@iki.fi Date: Wed Jan 30 11:42:47 2013 +0200 Need boost_headers Change-Id: Ic0d13034a37ba354000de18e6f97b9cc31857bcb diff --git a/ios/Executable_Viewer.mk b/ios/Executable_Viewer.mk index e982534..edde852 100644 --- a/ios/Executable_Viewer.mk +++ b/ios/Executable_Viewer.mk @@ -8,6 +8,7 @@ $(eval $(call gb_Executable_use_api,Viewer,\ )) $(eval $(call gb_Executable_use_externals,Viewer,\ +boost_headers \ iconv \ zlib \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||59270 --- Comment #95 from Rainer Bielefeld libreoff...@bielefeldundbuss.de --- I add Bug 59270 - TEMPLATE related: Page margin changes unexpectedly on page two: currently roots still unclear, but impossibility to create sane new Writer documents might affect may users. -- 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
Re: Change in core[master]: convert mysqlc to gbuild and add to tail_build
Le 28/01/2013 23:54, Michael Stahl (via Code Review) a écrit : Hi all, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1901 Approvals: Michael Stahl: Verified; Looks good to me, approved Something in one of these 2 mysql commits now causes a build failure on Mac OSX, because the configure macro forces a search for libmyqsl16.dylib in the wrong place. On OSX, you have to build the connector using the --with-libmysql-path switch as the source code libraries are not supplied by Apple in its version of mysql server (they have to be sourced from mysql). Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - basic/source cui/source filter/source sc/source sd/source svx/inc svx/source
basic/source/sbx/sbxvalue.cxx |4 ++--
cui/source/tabpages/tpshadow.cxx|3 +--
filter/source/msfilter/msdffimp.cxx |2 +-
sc/source/filter/excel/xiescher.cxx |2 +-
sd/source/core/drawdoc4.cxx | 12
sd/source/core/stlpool.cxx |2 +-
svx/inc/svx/sdshcitm.hxx| 15 ++-
svx/inc/svx/xcolit.hxx |1 +
svx/source/accessibility/charmapacc.cxx |8
svx/source/inc/charmapacc.hxx |4 ++--
svx/source/svdraw/svdattr.cxx |3 +--
svx/source/table/svdotable.cxx |5 ++---
svx/source/xoutdev/xattr.cxx|6 ++
13 files changed, 32 insertions(+), 35 deletions(-)
New commits:
commit d7ecbd0e655efb193da1561649ebd13fdd2f5af1
Author: Caolán McNamara caol...@redhat.com
Date: Wed Jan 30 10:40:45 2013 +
the name field for SdrShadowColorItem seems to be redundant now
Change-Id: I6e90cdfc9577bfa0ee1dd1018a41aa7979dfaf04
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index c0fa6c2..fa87c6c 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -334,8 +334,7 @@ sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet rAttrs )
if( nPos != LISTBOX_ENTRY_NOTFOUND
nPos != aLbShadowColor.GetSavedValue() )
{
-SdrShadowColorItem aItem( aLbShadowColor.GetSelectEntry(),
-aLbShadowColor.GetSelectEntryColor() );
+SdrShadowColorItem aItem(aLbShadowColor.GetSelectEntryColor());
pOld = GetOldItem( rAttrs, SDRATTR_SHADOWCOLOR );
if ( !pOld || !( *(const SdrShadowColorItem*)pOld == aItem ) )
{
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 23ab741..dda08b4 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2598,7 +2598,7 @@ void DffPropertyReader::ApplyAttributes( SvStream rIn,
SfxItemSet rSet, DffObj
}
}
if ( IsProperty( DFF_Prop_shadowColor ) )
-rSet.Put( SdrShadowColorItem( OUString(), rManager.MSO_CLR_ToColor(
GetPropertyValue( DFF_Prop_shadowColor ), DFF_Prop_shadowColor ) ) );
+rSet.Put( SdrShadowColorItem( rManager.MSO_CLR_ToColor(
GetPropertyValue( DFF_Prop_shadowColor ), DFF_Prop_shadowColor ) ) );
if ( IsProperty( DFF_Prop_shadowOpacity ) )
rSet.Put( SdrShadowTransparenceItem( (sal_uInt16)( ( 0x1 -
GetPropertyValue( DFF_Prop_shadowOpacity ) ) / 655 ) ) );
if ( IsProperty( DFF_Prop_shadowOffsetX ) )
diff --git a/sc/source/filter/excel/xiescher.cxx
b/sc/source/filter/excel/xiescher.cxx
index 24a5cc6..3af643f 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -691,7 +691,7 @@ void XclImpDrawObjBase::ConvertFrameStyle( SdrObject
rSdrObj, sal_uInt16 nFrame
rSdrObj.SetMergedItem( SdrShadowItem( sal_True ) );
rSdrObj.SetMergedItem( SdrShadowXDistItem( 35 ) );
rSdrObj.SetMergedItem( SdrShadowYDistItem( 35 ) );
-rSdrObj.SetMergedItem( SdrShadowColorItem( EMPTY_STRING,
GetPalette().GetColor( EXC_COLOR_WINDOWTEXT ) ) );
+rSdrObj.SetMergedItem( SdrShadowColorItem( GetPalette().GetColor(
EXC_COLOR_WINDOWTEXT ) ) );
}
}
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 3758a19..4e5cf19 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -147,8 +147,6 @@ void SdDrawDocument::CreateLayoutTemplates()
SfxItemSet rISet = pSheet-GetItemSet();
SfxItemPool* pPool = rISet.GetPool();
-String aNullStr;
-
::basegfx::B2DPolyPolygon aNullPolyPolygon;
ColoraNullCol(RGB_Color(COL_DEFAULT_SHAPE_STROKE));
@@ -185,7 +183,7 @@ void SdDrawDocument::CreateLayoutTemplates()
// Schattenattribute (Drawing Engine)
rISet.Put(SdrShadowItem(sal_False));
-rISet.Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY)));
+rISet.Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
rISet.Put(SdrShadowXDistItem(200)); // 3 mm Schattendistanz
rISet.Put(SdrShadowYDistItem(200));
@@ -294,7 +292,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet = pSheet-GetItemSet();
pISet-Put(SdrShadowItem(sal_True));
-pISet-Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY)));
+pISet-Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
pISet-Put(SdrShadowXDistItem(200));// 3 mm Schattendistanz
pISet-Put(SdrShadowYDistItem(200));
@@ -387,7 +385,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet-Put(XFillColorItem(String(), RGB_Color(COL_CYAN)));
pISet-Put(SdrShadowItem(sal_True));
-pISet-Put(SdrShadowColorItem(aNullStr, RGB_Color(COL_GRAY)));
+pISet-Put(SdrShadowColorItem(RGB_Color(COL_GRAY)));
pISet-Put(SdrShadowXDistItem(200));// 2 mm
Change in core[libreoffice-4-0]: resolved fdo#60043 write correct IM* function names
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1920
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/20/1920/1
resolved fdo#60043 write correct IM* function names
Prefixed with _xlfn. instead of programmatic Add-In name.
Change-Id: I4f119f92096329432488503f36df670a4ce19b42
(cherry picked from commit d701e808782f5849f22c112311a9553f08c8d553)
---
M sc/source/filter/oox/formulabase.cxx
1 file changed, 8 insertions(+), 0 deletions(-)
diff --git a/sc/source/filter/oox/formulabase.cxx
b/sc/source/filter/oox/formulabase.cxx
index ebbad45..929e6b0 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -729,6 +729,14 @@
static const FunctionData saFuncTable2013[] =
{
{ IFNA, IFNA, NOID, NOID, 2, 2,
V, { VO, RO }, FUNCFLAG_MACROCALL_NEW },
+{ IMCOSH, IMCOSH, NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+{ IMCOT, IMCOT,NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+{ IMCSC, IMCSC,NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+{ IMCSCH, IMCSCH, NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+{ IMSEC, IMSEC,NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+{ IMSECH, IMSECH, NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+{ IMSINH, IMSINH, NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+{ IMTAN, IMTAN,NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
};
/** Functions defined by OpenFormula, but not supported by Calc or by Excel. */
--
To view, visit https://gerrit.libreoffice.org/1920
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f119f92096329432488503f36df670a4ce19b42
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Eike Rathke er...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: fdo#39446 - Bloat Removal. Removing uncallable code with cal...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1921
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/1921/1
fdo#39446 - Bloat Removal. Removing uncallable code with callcatcher
Removed several unused methods.
Could not remove ScVbaFormatooo::vba::excel::XStyle::getAddIndent() and
ScVbaFormatooo::vba::excel::XStyle::setAddIndent(com::sun::star::uno::Any
const) because it breaks compilation (they are implementing pure virtual
methods).
Should Test::test1Table1Page() really be removed? (test class)
Change-Id: I98a761f66f28e3a82661c10a5fa1dc7e109fff2f
---
M editeng/inc/editeng/editobj.hxx
M editeng/source/editeng/editobj.cxx
M l10ntools/inc/po.hxx
M l10ntools/source/po.cxx
M sc/source/filter/excel/xepivot.cxx
M sc/source/filter/inc/drawingmanager.hxx
M sc/source/filter/inc/xepivot.hxx
M sc/source/filter/oox/drawingmanager.cxx
M sfx2/inc/sfx2/templateabstractview.hxx
M sfx2/source/control/templateabstractview.cxx
M tools/inc/tools/line.hxx
M tools/source/generic/line.cxx
M unusedcode.easy
M vcl/inc/outfont.hxx
M vcl/inc/vcl/settings.hxx
M vcl/inc/vcl/svapp.hxx
M vcl/source/app/settings.cxx
M vcl/source/app/svapp.cxx
M vcl/source/gdi/outdev3.cxx
M writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
M writerfilter/source/resourcemodel/util.cxx
M writerfilter/source/rtftok/rtfsprm.cxx
M writerfilter/source/rtftok/rtfsprm.hxx
M xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
M xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
25 files changed, 2 insertions(+), 221 deletions(-)
diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index 985b7c4..88aca76 100644
--- a/editeng/inc/editeng/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -95,14 +95,12 @@
void GetCharAttribs( sal_uInt16 nPara, std::vectorEECharAttrib rLst )
const;
bool RemoveCharAttribs( sal_uInt16 nWhich = 0 );
-bool RemoveParaAttribs( sal_uInt16 nWhich = 0 );
bool IsFieldObject() const;
const SvxFieldItem* GetField() const;
bool HasField( sal_Int32 nType =
com::sun::star::text::textfield::Type::UNSPECIFIED ) const;
const SfxItemSet GetParaAttribs(size_t nPara) const;
-void SetParaAttribs(size_t nPara, const SfxItemSet rAttribs);
void GetStyleSheet(size_t nPara, String rName, SfxStyleFamily eFamily)
const;
void SetStyleSheet(size_t nPara, const String rName, const
SfxStyleFamily eFamily);
diff --git a/editeng/source/editeng/editobj.cxx
b/editeng/source/editeng/editobj.cxx
index 5f400be..4d26047 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -240,19 +240,9 @@
return mpImpl-GetParaAttribs(nPara);
}
-void EditTextObject::SetParaAttribs(size_t nPara, const SfxItemSet rAttribs)
-{
-mpImpl-SetParaAttribs(nPara, rAttribs);
-}
-
bool EditTextObject::RemoveCharAttribs( sal_uInt16 nWhich )
{
return mpImpl-RemoveCharAttribs(nWhich);
-}
-
-bool EditTextObject::RemoveParaAttribs( sal_uInt16 nWhich )
-{
-return mpImpl-RemoveParaAttribs(nWhich);
}
void EditTextObject::GetStyleSheet(size_t nPara, String rName,
SfxStyleFamily eFamily) const
diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx
index a84b5a0..f3f6d6d 100644
--- a/l10ntools/inc/po.hxx
+++ b/l10ntools/inc/po.hxx
@@ -89,7 +89,6 @@
friend class PoOfstream;
friend class PoIfstream;
-PoHeader();
PoHeader( const OString rExtSrc );
PoHeader( std::ifstream rOldPo );
~PoHeader();
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index 23506ad..90b7f79 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -631,13 +631,6 @@
}
}
-//Default Constructor
-PoHeader::PoHeader()
-: m_pGenPo( 0 )
-, m_bIsInitialized( false )
-{
-}
-
//Template Constructor
PoHeader::PoHeader( const OString rExtSrc )
: m_pGenPo( new GenPoEntry() )
diff --git a/sc/source/filter/excel/xepivot.cxx
b/sc/source/filter/excel/xepivot.cxx
index 7db3245..f6ba6ff 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -779,15 +779,6 @@
return maFieldList.GetRecord( nFieldIdx ).get();
}
-XclExpPCField* XclExpPivotCache::GetFieldAcc( const rtl::OUString rFieldName )
-{
-XclExpPCField* pField = 0;
-for( size_t nPos = 0, nSize = maFieldList.GetSize(); !pField (nPos
nSize); ++nPos )
-if( maFieldList.GetRecord( nPos )-GetFieldName() == rFieldName )
-pField = maFieldList.GetRecord( nPos ).get();
-return pField;
-}
-
void XclExpPivotCache::AddFields( const ScDPObject rDPObj )
{
AddStdFields( rDPObj );
diff --git a/sc/source/filter/inc/drawingmanager.hxx
b/sc/source/filter/inc/drawingmanager.hxx
index 9c85a2f..b60dcd3 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -99,7 +99,6 @@
class BiffDrawingObjectBase
Change in core[libreoffice-4-0]: ODFF: write RRI as RRI, not ZGZ
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1922
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/1922/1
ODFF: write RRI as RRI, not ZGZ
ODF OpenFormula defines the function RRI, the legacy OOo XML format
stored that as ZGZ but that was not changed for the ODFF implementation.
Correctly read/write RRI now but still accept ZGZ to be able to load
existing documents.
See also
http://docs.oasis-open.org/office/v1.2/cs01/OpenDocument-v1.2-cs01-part2.html#RRI
Change-Id: I617eaa37ff483e9a02a218e8432ba918f54bd61a
(cherry picked from commit 8f9cb32ffe95ebd9934ddafc666a8df854bd)
---
M formula/source/core/resource/core_resource.src
M sc/source/core/tool/compiler.cxx
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index d21a737..f02f806 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -210,7 +210,7 @@
String SC_OPCODE_COLUMN { Text = COLUMN ; };
String SC_OPCODE_ROW { Text = ROW ; };
String SC_OPCODE_TABLE { Text = SHEET ; };
-String SC_OPCODE_ZGZ { Text = ZGZ ; };
+String SC_OPCODE_ZGZ { Text = RRI ; };
String SC_OPCODE_ZW { Text = FV ; };
String SC_OPCODE_ZZR { Text = NPER ; };
String SC_OPCODE_ZINS { Text = RATE ; };
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 74c2be9..597743a 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2469,7 +2469,8 @@
// Renamed old names:
{ B, ocB }, // B - BINOM.DIST.RANGE
{ TDIST, ocTDist }, // TDIST - LEGACY.TDIST
-{ EASTERSUNDAY, ocEasterSunday }// EASTERSUNDAY -
ORG.OPENOFFICE.EASTERSUNDAY
+{ EASTERSUNDAY, ocEasterSunday }, // EASTERSUNDAY -
ORG.OPENOFFICE.EASTERSUNDAY
+{ ZGZ,ocZGZ } // ZGZ - RRI
// Renamed new names:
// XXX none currently. Example:
//{ ORG.OPENOFFICE.EASTERSUNDAY, ocEasterSunday }
--
To view, visit https://gerrit.libreoffice.org/1922
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I617eaa37ff483e9a02a218e8432ba918f54bd61a
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Eike Rathke er...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Use a method from UnoApitest instead of implement a new one ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1923
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/1923/1
Use a method from UnoApitest instead of implement a new one in calc
In calc, we see a lot of implementations of createFileURL. So get ride
of all it and start to use the UnoAPitest::createFileURL method.
Also, clean the UnoApiRest::createFileURL method, fix the path from UnoApiTest
and
moved some testing files to the right dir that the file belongs.
Change-Id: Ic02f13777503729ac70da590f4a42866f17ea9b2
---
M sc/CppunitTest_sc_macros_test.mk
M sc/Module_sc.mk
M sc/qa/extras/macros-test.cxx
M sc/qa/extras/scannotationobj.cxx
M sc/qa/extras/scannotationsobj.cxx
M sc/qa/extras/sccellrangeobj.cxx
M sc/qa/extras/scdatabaserangeobj.cxx
M sc/qa/extras/scdatapilotfieldobj.cxx
M sc/qa/extras/scdatapilottableobj.cxx
M sc/qa/extras/sceditfieldobj-cell.cxx
M sc/qa/extras/sceditfieldobj-header.cxx
M sc/qa/extras/scmodelobj.cxx
M sc/qa/extras/scnamedrangeobj.cxx
M sc/qa/extras/scnamedrangesobj.cxx
M sc/qa/extras/scoutlineobj.cxx
M sc/qa/extras/sctablesheetobj.cxx
M sc/qa/extras/sctablesheetsobj.cxx
D sc/qa/unit/data/ods/StarBasic.ods
D sc/qa/unit/data/xls/TestAddress.xls
M test/inc/test/unoapi_test.hxx
M test/source/unoapi_test.cxx
21 files changed, 57 insertions(+), 41 deletions(-)
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 362a65e..66dd619 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -59,6 +59,7 @@
svx \
svxcore \
test \
+subsequenttest \
tl \
tk \
ucbhelper \
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 4a4fc41..1b3ba05 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -59,8 +59,6 @@
# CppunitTest_sc_annotationshapeobj \
$(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
-JunitTest_sc_complex \
-JunitTest_sc_unoapi \
CppunitTest_sc_outlineobj \
CppunitTest_sc_annotationobj \
CppunitTest_sc_annotationsobj \
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 364ca1b..d6ccdb1 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -29,7 +29,7 @@
*/
#include sal/config.h
-#include test/bootstrapfixture.hxx
+#include test/unoapi_test.hxx
#include unotest/macros_test.hxx
#include rtl/strbuf.hxx
#include osl/file.hxx
@@ -53,12 +53,10 @@
/* Implementation of Macros test */
-class ScMacrosTest : public test::BootstrapFixture, public unotest::MacrosTest
+class ScMacrosTest : public UnoApiTest
{
public:
ScMacrosTest();
-
-void createFileURL(const rtl::OUString aFileBase, const rtl::OUString
aFileExtension, rtl::OUString rFilePath);
virtual void setUp();
virtual void tearDown();
@@ -77,25 +75,13 @@
private:
uno::Referenceuno::XInterface m_xCalcComponent;
-rtl::OUString m_aBaseString;
};
-
-
-void ScMacrosTest::createFileURL(const rtl::OUString aFileBase, const
rtl::OUString aFileExtension, rtl::OUString rFilePath)
-{
-rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM(/));
-rtl::OUStringBuffer aBuffer( getSrcRootURL() );
-aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension);
-aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
-rFilePath = aBuffer.makeStringAndClear();
-}
void ScMacrosTest::testStarBasic()
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(StarBasic.));
-rtl::OUString aFileExtension(ods);
+const OUString aFileNameBase(StarBasic.ods);
rtl::OUString aFileName;
-createFileURL(aFileNameBase, aFileExtension, aFileName);
+createFileURL(aFileNameBase, aFileName);
std::cout StarBasic test std::endl;
uno::Reference com::sun::star::lang::XComponent xComponent =
loadFromDesktop(aFileName);
@@ -136,11 +122,10 @@
}
};
-rtl::OUString aFileExtension(xls);
for ( sal_uInt32 i=0; iSAL_N_ELEMENTS( testInfo ); ++i )
{
rtl::OUString aFileName;
-createFileURL(testInfo[i].sFileBaseName, aFileExtension, aFileName);
+createFileURL(testInfo[i].sFileBaseName + xls, aFileName);
uno::Reference com::sun::star::lang::XComponent xComponent =
loadFromDesktop(aFileName);
rtl::OUString sMsg( Failed to load + aFileName );
CPPUNIT_ASSERT_MESSAGE( rtl::OUStringToOString( sMsg,
RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
@@ -164,7 +149,7 @@
}
ScMacrosTest::ScMacrosTest()
- : m_aBaseString(RTL_CONSTASCII_USTRINGPARAM(/sc/qa/unit/data))
+ : UnoApiTest(/sc/qa/extras/testdocuments)
{
}
diff --git a/sc/qa/extras/scannotationobj.cxx b/sc/qa/extras/scannotationobj.cxx
index 29d9cbf..fdbd748 100644
--- a/sc/qa/extras/scannotationobj.cxx
+++ b/sc/qa/extras/scannotationobj.cxx
@@ -70,6 +70,7 @@
uno::Reference lang::XComponent ScAnnontationObj::mxComponent;
Change in core[master]: WITH_LANG: add en-US if it is missing
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1919 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1919 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie12913691fa3d01bc7ad2fc0c108821d0937d250 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: fdo#44582 fixing horizontal scroll bar in sub windows
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1908 Approvals: Lior Kaplan: Verified Miklos Vajna: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1908 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifea57dec77c5b23771684a1e46267f8431478075 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Lior Kaplan kaplanl...@gmail.com Gerrit-Reviewer: Abdulaziz A Alayed aala...@kacst.edu.sa Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Lior Kaplan kaplanl...@gmail.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: Template Manager: focus in search edit when clicking search ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1916 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1916 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I91fa8463442d842ef9929a87fb22e5e1a0a869b5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1924 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/1924/1 Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd --- M bridges/source/jni_uno/jni_base.h M bridges/source/jni_uno/jni_bridge.cxx M bridges/source/jni_uno/jni_info.h M bridges/source/jni_uno/jni_java2uno.cxx M bridges/source/jni_uno/jni_uno2java.cxx M bridges/test/inter_libs_exc/inter.cxx M bridges/test/inter_libs_exc/share.h M bridges/test/inter_libs_exc/thrower.cxx M chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx M chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx M chart2/source/controller/main/ChartController_Insert.cxx M chart2/source/controller/main/ChartController_Properties.cxx M chart2/source/controller/main/ChartController_TextEdit.cxx M chart2/source/controller/main/ChartController_Tools.cxx M chart2/source/controller/main/ChartController_Window.cxx M chart2/source/controller/main/ChartFrameloader.cxx M chart2/source/controller/main/CommandDispatchContainer.cxx M chart2/source/controller/main/ConfigurationAccess.cxx M chart2/source/controller/main/ControllerCommandDispatch.cxx M chart2/source/controller/main/DragMethod_PieSegment.cxx M chart2/source/controller/main/DragMethod_RotateDiagram.cxx M chart2/source/controller/main/DrawCommandDispatch.cxx M chart2/source/controller/main/ElementSelector.cxx M chart2/source/controller/main/ObjectHierarchy.cxx M chart2/source/controller/main/PositionAndSizeHelper.cxx M chart2/source/controller/main/SelectionHelper.cxx M chart2/source/controller/main/StatusBarCommandDispatch.cxx M chart2/source/controller/main/UndoCommandDispatch.cxx M chart2/source/inc/macros.hxx M chart2/source/model/filter/XMLFilter.cxx M chart2/source/model/main/Axis.cxx M chart2/source/model/main/BaseCoordinateSystem.cxx M chart2/source/model/main/CartesianCoordinateSystem.cxx M chart2/source/model/main/ChartModel.cxx M chart2/source/model/main/ChartModel_Persistence.cxx M chart2/source/model/main/DataPoint.cxx M chart2/source/model/main/DataPointProperties.cxx M chart2/source/model/main/DataSeries.cxx M chart2/source/model/main/DataSeriesProperties.cxx M chart2/source/model/main/Diagram.cxx M chart2/source/model/main/FormattedString.cxx M chart2/source/model/main/GridProperties.cxx M chart2/source/model/main/Legend.cxx M chart2/source/model/main/PageBackground.cxx M chart2/source/model/main/PolarCoordinateSystem.cxx M chart2/source/model/main/StockBar.cxx M chart2/source/model/main/Title.cxx M chart2/source/model/main/Wall.cxx M chart2/source/model/template/AreaChartType.cxx M chart2/source/model/template/AreaChartTypeTemplate.cxx M chart2/source/model/template/BarChartType.cxx M chart2/source/model/template/BarChartTypeTemplate.cxx M chart2/source/model/template/BubbleChartType.cxx M chart2/source/model/template/BubbleChartTypeTemplate.cxx M chart2/source/model/template/BubbleDataInterpreter.cxx M chart2/source/model/template/CandleStickChartType.cxx M chart2/source/model/template/ChartType.cxx M chart2/source/model/template/ChartTypeManager.cxx M chart2/source/model/template/ChartTypeTemplate.cxx M chart2/source/model/template/ColumnChartType.cxx M chart2/source/model/template/ColumnLineChartTypeTemplate.cxx M chart2/source/model/template/DataInterpreter.cxx M chart2/source/model/template/FilledNetChartType.cxx M chart2/source/model/template/LineChartType.cxx M chart2/source/model/template/LineChartTypeTemplate.cxx M chart2/source/model/template/NetChartType.cxx M chart2/source/model/template/NetChartTypeTemplate.cxx M chart2/source/model/template/PieChartType.cxx M chart2/source/model/template/PieChartTypeTemplate.cxx M chart2/source/model/template/ScatterChartType.cxx M chart2/source/model/template/ScatterChartTypeTemplate.cxx M chart2/source/model/template/StockChartTypeTemplate.cxx M chart2/source/model/template/StockDataInterpreter.cxx M chart2/source/model/template/XYDataInterpreter.cxx M chart2/source/tools/AxisHelper.cxx M chart2/source/tools/CachedDataSequence.cxx M chart2/source/tools/CharacterProperties.cxx M chart2/source/tools/ChartModelHelper.cxx M chart2/source/tools/ChartTypeHelper.cxx M chart2/source/tools/ColorPerPointHelper.cxx M chart2/source/tools/ConfigColorScheme.cxx M chart2/source/tools/DataSeriesHelper.cxx M chart2/source/tools/DataSourceHelper.cxx M chart2/source/tools/DiagramHelper.cxx M chart2/source/tools/ErrorBar.cxx M chart2/source/tools/ExplicitCategoriesProvider.cxx M chart2/source/tools/ExponentialRegressionCurveCalculator.cxx M chart2/source/tools/FillProperties.cxx M chart2/source/tools/FormattedStringHelper.cxx M chart2/source/tools/InternalData.cxx M chart2/source/tools/InternalDataProvider.cxx M chart2/source/tools/LabeledDataSequence.cxx M chart2/source/tools/LegendHelper.cxx M chart2/source/tools/LineProperties.cxx M
[Libreoffice-commits] .: configure.ac instsetoo_native/util
configure.ac| 378 ++-- instsetoo_native/util/openoffice.lst.in |2 2 files changed, 79 insertions(+), 301 deletions(-) New commits: commit 8d16259c3428c3badfe7d156546be05ab0796a9c Author: Mathias Michel m...@gmx.fr Date: Thu Dec 6 02:39:16 2012 +0100 Consolidated branding in configure Removed individual options (intro* and startcenter* + images) in favor of a folder with graceful fallback. Grouped progress bar intro settings in a text file into the branding folder Change-Id: Ib56b80e43c474a944ac79c0a842d66487e9f91d5 Reviewed-on: https://gerrit.libreoffice.org/1704 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/configure.ac b/configure.ac index d3a2a2c..eb0a434 100644 --- a/configure.ac +++ b/configure.ac @@ -1832,110 +1832,37 @@ dnl Branding dnl === AC_ARG_WITH(branding, -[ --with-brandingUse given path to retrieve all branding images. - Expects /path/intro.png ... - /path/backing_rtl_right.png to be there. Individual - images can be overridden via --with-intro-bitmap ... - --with-startcenter-rtl-left-bitmap switches. - - Usage: --with-branding=/path/to/images -],,) - -AC_ARG_WITH(intro-bitmap, -[ --with-intro-bitmapPrefer the specified intro bitmap over the - the default one. - - Usage: --with-intro-bitmap=/path/my_ooo_intro.png -],,) - -AC_ARG_WITH(intro-progressbar-color, -[ --with-intro-progressbar-colorSet color of progress bar on intro screen. - Comma separated RGB values in decimal format. - - Usage: --with-intro-progressbar-color=126,170,23 -],,) - -AC_ARG_WITH(intro-progressbar-size, -[ --with-intro-progressbar-size Set size of progress bar on intro screen. - Comma separated values in decimal format. - - Usage: --with-intro-progressbar-size=319,10 -],,) - -AC_ARG_WITH(intro-progressbar-position, -[ --with-intro-progressbar-position Set position of progress bar on intro screen. - Comma separated values in decimal format. - - Usage: --with-intro-progressbar-position=164,225 -],,) - -AC_ARG_WITH(intro-progressbar-frame-color, -[ --with-intro-progressbar-frame-colorSet color of progress bar frame on intro screen. - Comma separated RGB values in decimal format. - - Usage: --with-intro-progressbar-frame-color=207,208,211 -],,) - -AC_ARG_WITH(intro-progressbar-text-color, -AS_HELP_STRING([--with-intro-progressbar-text-color], -[Set color of progress bar text on intro screen. Comma separated RGB values in decimal format.]) -[ - Usage: --with-intro-progressbar-text-color=207,208,211 -],,) - -AC_ARG_WITH(intro-progressbar-text-baseline, -AS_HELP_STRING([--with-intro-progressbar-text-baseline], -[Set vertical position of progress bar text on intro screen. Value in decimal format.]) +AS_HELP_STRING([--with-branding], +[Use given path to retrieve branding images set.]) [ - Usage: --with-intro-progressbar-text-baseline=250 -],,) + Search for intro.png about.svg flat_logo.svg + backing_left.png backing_right.png + backing_rtl_left.png backing_rtl_right.png + backing_space.png. If any is missing, default + ones will be used instead. + + Search also progress.conf for progress + settings on intro screen : + + PROGRESSBARCOLOR=255,255,255 Set color of + progress bar. Comma separated RGB decimal values. + PROGRESSSIZE=407,6 Set size of progress bar. + Comma separated decimal values (width, height). + PROGRESSPOSITION=61,317 Set position of progress + bar from left,top. Comma separated decimal values. + PROGRESSFRAMECOLOR=20,136,3 Set color of progress + bar frame. Comma separated RGB decimal values. + PROGRESSTEXTCOLOR=255,255,255 Set color of progress + bar text. Comma separated RGB decimal values. + PROGRESSTEXTBASELINE=287 Set vertical position of + progress bar text from top. Decimal value. + + Default values will be used if not found.
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 21159c0d092ca269306576171ddcb17c5b51ef5b Author: Caolán McNamara caol...@redhat.com Date: Wed Jan 30 11:13:56 2013 + Updated core Project: help c725b25af49aa5292a88eb0fd53eb322861567d1 diff --git a/helpcontent2 b/helpcontent2 index 97ee0b3..c725b25 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 97ee0b3910f1652911f01443c27e9b77e7582332 +Subproject commit c725b25af49aa5292a88eb0fd53eb322861567d1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: helpers/help_hid.lst source/text
helpers/help_hid.lst |6 -- source/text/shared/optionen/01012000.xhp | 17 + 2 files changed, 9 insertions(+), 14 deletions(-) New commits: commit c725b25af49aa5292a88eb0fd53eb322861567d1 Author: Caolán McNamara caol...@redhat.com Date: Wed Jan 30 11:13:56 2013 + update help ids for appearance option page .ui conversion diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 7dadb69..d5a94b0 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2688,10 +2688,7 @@ HID_OPTCREATEFAX,41150, HID_OPTIONS_ASIAN_LAYOUT,34183, HID_OPTIONS_CHART_DEFCOLORS,40055, HID_OPTIONS_COLOR,33808, -HID_OPTIONS_COLORCONFIG,34197, -HID_OPTIONS_COLORCONFIG_COLORLIST_WIN,39871, HID_OPTIONS_COLORCONFIG_NAME_SCHEME,39875, -HID_OPTIONS_COLORCONFIG_SAVE_SCHEME,34198, HID_OPTIONS_CTL,39880, HID_OPTIONS_DICT_EDIT,33815, HID_OPTIONS_DICT_EDIT_ENTRIES_LIST,39896, @@ -8016,7 +8013,6 @@ svx_ListBox_RID_SVXPAGE_BORDER_LB_SHADOWCOLOR,700796452, svx_ListBox_RID_SVXPAGE_CAPTION_LB_ANSATZ,703172098, svx_ListBox_RID_SVXPAGE_CAPTION_LB_ANSATZ_REL,703172099, svx_ListBox_RID_SVXPAGE_CAPTION_LB_WINKEL,703172097, -svx_ListBox_RID_SVXPAGE_COLORCONFIG_LB_COLORSCHEME,704794115, svx_ListBox_RID_SVXPAGE_COLOR_LB_COLOR,701697537, svx_ListBox_RID_SVXPAGE_COLOR_LB_COLORMODEL,701697538, svx_ListBox_RID_SVXPAGE_CONNECTION_LB_TYPE,703843841, @@ -8406,8 +8402,6 @@ svx_PushButton_RID_SVXPAGE_BITMAP_BTN_ADD,701665793, svx_PushButton_RID_SVXPAGE_BITMAP_BTN_DELETE,701665796, svx_PushButton_RID_SVXPAGE_BITMAP_BTN_IMPORT,701665794, svx_PushButton_RID_SVXPAGE_BITMAP_BTN_MODIFY,701665795, -svx_PushButton_RID_SVXPAGE_COLORCONFIG_PB_DELETESCHEME,704795141, -svx_PushButton_RID_SVXPAGE_COLORCONFIG_PB_SAVESCHEME,704795140, svx_PushButton_RID_SVXPAGE_COLOR_BTN_ADD,701698561, svx_PushButton_RID_SVXPAGE_COLOR_BTN_DELETE,701698564, svx_PushButton_RID_SVXPAGE_COLOR_BTN_MODIFY,701698563, diff --git a/source/text/shared/optionen/01012000.xhp b/source/text/shared/optionen/01012000.xhp index 4160392..51072be 100644 --- a/source/text/shared/optionen/01012000.xhp +++ b/source/text/shared/optionen/01012000.xhp @@ -36,6 +36,7 @@ bookmark_valueoptions; appearance/bookmark_value bookmark_valueappearance options/bookmark_value /bookmark +bookmark xml-lang=en-US branch=hid/cui/ui/optappearancepage/OptAppearancePage id=bm_id3154899 localize=false/ paragraph role=heading id=hd_id3153527 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/optionen/01012000.xhp name=AppearanceAppearance/link/paragraph paragraph role=paragraph id=par_id3145120 xml-lang=en-US l10n=U oldref=2ahelp hid=.Sets the colors for the $[officename] user interface./ahelp You can save the current settings as color scheme and load them later./paragraph /section @@ -45,21 +46,21 @@ embed href=text/shared/guide/accessibility.xhp#accessibility/ paragraph role=heading id=hd_id3154046 xml-lang=en-US level=2 l10n=U oldref=3Color scheme/paragraph paragraph role=paragraph id=par_id3152349 xml-lang=en-US l10n=U oldref=4Save and delete color schemes./paragraph -bookmark xml-lang=en-US branch=hid/cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME id=bm_id3154898 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/optappearancepage/colorschemelb id=bm_id3154898 localize=false/ paragraph role=heading id=hd_id3153252 xml-lang=en-US level=3 l10n=U oldref=5Scheme/paragraph -paragraph role=paragraph id=par_id3153541 xml-lang=en-US l10n=U oldref=6ahelp hid=SVX_LISTBOX_RID_SVXPAGE_COLORCONFIG_LB_COLORSCHEMESelects the color scheme you want to use./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME id=bm_id3153088 localize=false/ +paragraph role=paragraph id=par_id3153541 xml-lang=en-US l10n=U oldref=6ahelp hid=cui/ui/optappearancepage/colorschemelbSelects the color scheme you want to use./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/optappearancepage/save id=bm_id3153088 localize=false/ paragraph role=heading id=hd_id3153665 xml-lang=en-US level=3 l10n=U oldref=7Save/paragraph -paragraph role=paragraph id=par_id3145609 xml-lang=en-US l10n=U oldref=8ahelp hid=SVX_PUSHBUTTON_RID_SVXPAGE_COLORCONFIG_PB_SAVESCHEMESaves the current settings as a color scheme that you can reload later./ahelp The name is added to the emphScheme/emph box./paragraph +paragraph role=paragraph id=par_id3145609 xml-lang=en-US l10n=U oldref=8ahelp hid=cui/ui/optappearancepage/saveSaves the current settings as a color scheme that you can reload later./ahelp The name is added to the emphScheme/emph box./paragraph bookmark xml-lang=en-US branch=hid/CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME id=bm_id3148552 localize=false/ paragraph role=heading id=hd_id3149669 xml-lang=en-US level=3 l10n=U oldref=9Name of color scheme/paragraph paragraph role=paragraph id=par_id3159413 xml-lang=en-US l10n=U oldref=10ahelp hid=HID_OPTIONS_COLORCONFIG_NAME_SCHEMEEnter a name
[Libreoffice-commits] .: sw/source
sw/source/ui/docvw/edtwin.cxx | 58 ++
1 file changed, 42 insertions(+), 16 deletions(-)
New commits:
commit 94721b2aec614e0d99504138d484b2ad6cd550c7
Author: Michael Stahl mst...@redhat.com
Date: Wed Jan 30 00:45:44 2013 +0100
fdo#59928: sw: fix mouse selection of fields:
SwEditWin::MouseButtonDown: the selection of fields was messed up by a
call to rSh.SetCursor near the bottom of the method. This used to be
fixed up by SwEditWin::MouseButtonUp previously, but that was broken
with commit dcb080347ca127044313bbb3c11c37761cc2a7a2.
To fix that move the field selection code to a place where it prevents
the other code from running, in the hope that it is not necessary.
Also it does not make any sense to select whole words when clicking on a
field, just selecting the field seems much better.
Change-Id: I8d604450789844b6a446cf3a35f62ed530d0328e
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 9b4ec05..78c6491 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -131,6 +131,7 @@
#include IMark.hxx
#include doc.hxx
+#include txatbase.hxx // FIXME this sucks
#include xmloff/odffields.hxx
#include PostItMgr.hxx
@@ -3210,22 +3211,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
if (aVEvt.eEvent == SDREVENT_EXECUTEURL)
bExecDrawTextLink = true;
}
-
-SwContentAtPos aFieldAtPos ( SwContentAtPos::SW_FIELD
);
-
-// Are we selecting a field?
-if ( rSh.GetContentAtPos( aDocPos, aFieldAtPos ) )
-{
-// select work, AdditionalMode if applicable
-if ( KEY_MOD1 == rMEvt.GetModifier()
!rSh.IsAddMode() )
-{
-rSh.EnterAddMode();
-rSh.SelWrd( aDocPos );
-rSh.LeaveAddMode();
-}
-else
-rSh.SelWrd( aDocPos );
-}
break;
}
case 2:
@@ -3563,6 +3548,47 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
rSh.ClearGCAttr();
}
+SwContentAtPos aFieldAtPos(SwContentAtPos::SW_FIELD);
+
+// Are we clicking on a field?
+if (rSh.GetContentAtPos(aDocPos, aFieldAtPos))
+{
+bool bAddMode(false); // AdditionalMode if applicable
+if (KEY_MOD1 == rMEvt.GetModifier() !rSh.IsAddMode())
+{
+bAddMode = true;
+rSh.EnterAddMode();
+}
+rSh.SetCursor(aDocPos, bOnlyText);
+// Select the field. Unfortunately cursor may be on field
+// position or on position after field depending on which
+// half of the field was clicked on.
+SwTxtAttr const*const pTxtFld(aFieldAtPos.pFndTxtAttr);
+if (rSh.GetCurrentShellCursor().GetPoint()-nContent
+.GetIndex() == *pTxtFld-GetStart())
+{
+rSh.Right( CRSR_SKIP_CHARS, true, 1, false );
+rSh.NormalizePam();
+}
+else
+{
+assert(rSh.GetCurrentShellCursor().GetPoint()-nContent
+.GetIndex() == (*pTxtFld-GetStart() + 1));
+rSh.Left( CRSR_SKIP_CHARS, true, 1, false );
+}
+// it's a bit of a mystery what this is good for?
+// in this case we assume it's valid since we just
+// selected a field
+bValidCrsrPos = true;
+if (bAddMode)
+{
+rSh.LeaveAddMode();
+}
+// don't go into the !bOverSelect block below - it moves
+// the cursor
+break;
+}
+
sal_Bool bOverSelect = rSh.ChgCurrPam( aDocPos ), bOverURLGrf
= sal_False;
if( !bOverSelect )
bOverURLGrf = bOverSelect = 0 != rSh.IsURLGrfAtPos(
aDocPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - offapi/com offapi/UnoApi_offapi.mk sw/inc sw/qa sw/source
offapi/UnoApi_offapi.mk |1
offapi/com/sun/star/text/GradientTable.idl| 33
sw/inc/hintids.hxx| 48 +-
sw/qa/extras/odfexport/data/textframe-gradient.odt|binary
sw/qa/extras/odfexport/odfexport.cxx | 25 +
sw/qa/extras/ooxmlexport/data/textframe-gradient.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 27 +-
sw/source/filter/ww8/attributeoutputbase.hxx |8 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 42 +++
sw/source/filter/ww8/docxattributeoutput.hxx | 11
sw/source/filter/ww8/rtfattributeoutput.cxx |8 +++
sw/source/filter/ww8/rtfattributeoutput.hxx |6 ++
sw/source/filter/ww8/ww8atr.cxx | 18 ++
sw/source/filter/ww8/ww8attributeoutput.hxx |6 ++
14 files changed, 207 insertions(+), 26 deletions(-)
New commits:
commit d3c72662488cd2fad1876e8f4c17d54f26245a7a
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Jan 30 12:37:23 2013 +0100
sw: add textframe gradient DOCX roundtrip testcase
Change-Id: I77f63631b5b666e2735978d1bf48ef5733a9f28e
diff --git a/sw/qa/extras/ooxmlexport/data/textframe-gradient.docx
b/sw/qa/extras/ooxmlexport/data/textframe-gradient.docx
new file mode 100755
index 000..e5ed068
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/textframe-gradient.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 4ff3f98..d39489a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -26,6 +26,8 @@
*/
#include com/sun/star/frame/XStorable.hpp
+#include com/sun/star/drawing/FillStyle.hpp
+#include com/sun/star/awt/Gradient.hpp
#include com/sun/star/style/TabStop.hpp
#include com/sun/star/view/XViewSettingsSupplier.hpp
#include com/sun/star/text/XTextFrame.hpp
@@ -71,6 +73,7 @@ public:
void test1Table1Page();
void testTextFrames();
void testTextFrameBorders();
+void testTextframeGradient();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -111,7 +114,8 @@ void Test::run()
{n789482.docx, Test::testN789482},
// {1-table-1-page.docx, Test::test1Table1Page}, // doesn't work on
openSUSE12.2 at least
{textframes.odt, Test::testTextFrames},
-{textframe-borders.docx, Test::testTextFrameBorders}
+{textframe-borders.docx, Test::testTextFrameBorders},
+{textframe-gradient.docx, Test::testTextframeGradient},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -539,6 +543,27 @@ void Test::testTextFrameBorders()
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x622423), aShadowFormat.Color);
}
+void Test::testTextframeGradient()
+{
+uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess-getCount());
+
+uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_GRADIENT,
getPropertydrawing::FillStyle(xFrame, FillStyle));
+awt::Gradient aGradient = getPropertyawt::Gradient(xFrame,
FillGradient);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xC0504D), aGradient.StartColor);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD99594), aGradient.EndColor);
+CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_AXIAL, aGradient.Style);
+
+xFrame.set(xIndexAccess-getByIndex(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_GRADIENT,
getPropertydrawing::FillStyle(xFrame, FillStyle));
+aGradient = getPropertyawt::Gradient(xFrame, FillGradient);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00), aGradient.StartColor);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x66), aGradient.EndColor);
+CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_AXIAL, aGradient.Style);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
commit b7de0431375926878646db1b1113573fb27f1cde
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Jan 30 12:22:18 2013 +0100
initial DOCX export of Writer textframe gradients
Change-Id: I0b0a623c58ca398bb556fc9fcd2cdecb4e789d0a
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 42e488e..917ddb5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -70,6 +70,8 @@
#include editeng/editobj.hxx
#include svx/svdmodel.hxx
#include svx/svdobj.hxx
+#include svx/xfillit0.hxx
+#include svx/xflgrit.hxx
#include sfx2/sfxbasemodel.hxx
#include anchoredobject.hxx
@@ -315,6 +317,12 @@ void
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - filter/source
filter/source/msfilter/escherex.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit eae62710abb46e83376d38c259b98a2778a5bb72
Author: Michael Stahl mst...@redhat.com
Date: Thu Jan 24 23:12:38 2013 +0100
fdo#58204: PPT export: fix text rotation in shapes:
EscherPropertyContainer::CreateTextProperties: do not write
ESCHER_Prop_txflTextFlow for custom shapes. This happens to export the
rotation properly for the WW8 bugdoc of n#404221, as well as the PPT at
fdo#58204 and both PPTs at fdo#34897, one of which (mangle.ppt) was not
handled properly on master currently. The author disclaims having any
actual knowledge about rotation properties in MSO files.
(regression from 24dd42f316e5cb16ba726c05ba486d53e033052d)
(cherry picked from commit 2823789bec0c029d9714aff0ed65923e23177ef9)
Conflicts:
filter/source/msfilter/escherex.cxx
Change-Id: Id3dcfb6221d031cdabb7f543b68752b467d9e1a6
Reviewed-on: https://gerrit.libreoffice.org/1863
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 56ed5c3..022a966 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -690,7 +690,9 @@ void EscherPropertyContainer::CreateTextProperties(
// n#404221: In case of rotation we need to write the txtflTextFlow
// attribute too.
-if (bIsTextFrame) {
+// fdo#58204: not custom shapes (TODO: other cases when it doesn't work?)
+if (bIsTextFrame !bIsCustomShape)
+{
sal_uInt16 nAngle = EscherPropertyValueHelper::GetPropertyValue(
aAny,
rXPropSet,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Change in core[master]: Consolidated branding in configure
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1704 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1704 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib56b80e43c474a944ac79c0a842d66487e9f91d5 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Mathias M m...@gmx.fr Gerrit-Reviewer: Mathias M m...@gmx.fr Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: fdo#59928: sw: fix mouse selection of fields:
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1925
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/25/1925/1
fdo#59928: sw: fix mouse selection of fields:
SwEditWin::MouseButtonDown: the selection of fields was messed up by a
call to rSh.SetCursor near the bottom of the method. This used to be
fixed up by SwEditWin::MouseButtonUp previously, but that was broken
with commit dcb080347ca127044313bbb3c11c37761cc2a7a2.
To fix that move the field selection code to a place where it prevents
the other code from running, in the hope that it is not necessary.
Also it does not make any sense to select whole words when clicking on a
field, just selecting the field seems much better.
Change-Id: I8d604450789844b6a446cf3a35f62ed530d0328e
(cherry picked from commit 94721b2aec614e0d99504138d484b2ad6cd550c7)
---
M sw/source/ui/docvw/edtwin.cxx
1 file changed, 42 insertions(+), 16 deletions(-)
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index af64e0f..289aa15 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -131,6 +131,7 @@
#include IMark.hxx
#include doc.hxx
+#include txatbase.hxx // FIXME this sucks
#include xmloff/odffields.hxx
#include PostItMgr.hxx
@@ -3216,22 +3217,6 @@
if (aVEvt.eEvent == SDREVENT_EXECUTEURL)
bExecDrawTextLink = sal_True;
}
-
-SwContentAtPos aFieldAtPos ( SwContentAtPos::SW_FIELD
);
-
-// Are we selecting a field?
-if ( rSh.GetContentAtPos( aDocPos, aFieldAtPos ) )
-{
-// select work, AdditionalMode if applicable
-if ( KEY_MOD1 == rMEvt.GetModifier()
!rSh.IsAddMode() )
-{
-rSh.EnterAddMode();
-rSh.SelWrd( aDocPos );
-rSh.LeaveAddMode();
-}
-else
-rSh.SelWrd( aDocPos );
-}
break;
}
case 2:
@@ -3567,6 +3552,47 @@
rSh.ClearGCAttr();
}
+SwContentAtPos aFieldAtPos(SwContentAtPos::SW_FIELD);
+
+// Are we clicking on a field?
+if (rSh.GetContentAtPos(aDocPos, aFieldAtPos))
+{
+bool bAddMode(false); // AdditionalMode if applicable
+if (KEY_MOD1 == rMEvt.GetModifier() !rSh.IsAddMode())
+{
+bAddMode = true;
+rSh.EnterAddMode();
+}
+rSh.SetCursor(aDocPos, bOnlyText);
+// Select the field. Unfortunately cursor may be on field
+// position or on position after field depending on which
+// half of the field was clicked on.
+SwTxtAttr const*const pTxtFld(aFieldAtPos.pFndTxtAttr);
+if (rSh.GetCurrentShellCursor().GetPoint()-nContent
+.GetIndex() == *pTxtFld-GetStart())
+{
+rSh.Right( CRSR_SKIP_CHARS, true, 1, false );
+rSh.NormalizePam();
+}
+else
+{
+assert(rSh.GetCurrentShellCursor().GetPoint()-nContent
+.GetIndex() == (*pTxtFld-GetStart() + 1));
+rSh.Left( CRSR_SKIP_CHARS, true, 1, false );
+}
+// it's a bit of a mystery what this is good for?
+// in this case we assume it's valid since we just
+// selected a field
+bValidCrsrPos = true;
+if (bAddMode)
+{
+rSh.LeaveAddMode();
+}
+// don't go into the !bOverSelect block below - it moves
+// the cursor
+break;
+}
+
sal_Bool bOverSelect = rSh.ChgCurrPam( aDocPos ), bOverURLGrf
= sal_False;
if( !bOverSelect )
bOverURLGrf = bOverSelect = 0 != rSh.IsURLGrfAtPos(
aDocPos );
--
To view, visit https://gerrit.libreoffice.org/1925
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d604450789844b6a446cf3a35f62ed530d0328e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Michael Stahl mst...@redhat.com
___
LibreOffice mailing list
Change in core[libreoffice-3-6]: fdo#58204: PPT export: fix text rotation in shapes:
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1863 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1863 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id3dcfb6221d031cdabb7f543b68752b467d9e1a6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - android/qa sal/inc sc/source solenv/bin solenv/gbuild tools/source vcl/aqua
android/qa/sc/Makefile |4 -
sal/inc/sal/log-areas.dox|1
sc/source/ui/vba/testvba/runTests.pl |1
solenv/bin/linkoo|1
solenv/gbuild/AllLangResTarget.mk| 11 +++-
solenv/gbuild/CppunitTest.mk |1
solenv/gbuild/TargetLocations.mk |2
tools/source/rc/resmgr.cxx | 89 +++
vcl/aqua/source/app/salinst.cxx | 48 --
9 files changed, 42 insertions(+), 116 deletions(-)
New commits:
commit e63bfb3035cd01983600a23ab289601dd9b2cf11
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jan 30 13:41:53 2013 +0100
Get rid of STAR_RESOURCEPATH
...the only remaining use was for CppunitTest to find the .res files in
$(OUTDIR)/bin/. Get that solved by delivering the .res files also to
$(OUTDIR)/unittest/install/program/resource/ (new
gb_ResTarget_get_unittest_target).
Change-Id: I370e7cab4223256356c7511b88ae63d9c0dbf215
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index e52b589..da40618 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -177,8 +177,8 @@ copy-stuff:
mkdir -p assets/unpack/etc/fonts
cp fonts.conf assets/unpack/etc/fonts
# The indirect command lines...
- echo SAL_LOG=+WARN+INFO STAR_RESOURCEPATH=/assets/bin
$(APP_DATA_PATH)/lib/libtest_sc_ucalc.so --headless --protector
libunoexceptionprotector.so unoexceptionprotector --protector
libunobootstrapprotector.so unobootstrapprotector assets/unpack/ucalc.cmdline
- echo SAL_LOG=+WARN+INFO STAR_RESOURCEPATH=/assets/bin
$(APP_DATA_PATH)/lib/libtest_sc_filters_test.so --headless --protector
libunoexceptionprotector.so unoexceptionprotector --protector
libunobootstrapprotector.so unobootstrapprotector
assets/unpack/filters_test.cmdline
+ echo SAL_LOG=+WARN+INFO $(APP_DATA_PATH)/lib/libtest_sc_ucalc.so
--headless --protector libunoexceptionprotector.so unoexceptionprotector
--protector libunobootstrapprotector.so unobootstrapprotector
assets/unpack/ucalc.cmdline
+ echo SAL_LOG=+WARN+INFO
$(APP_DATA_PATH)/lib/libtest_sc_filters_test.so --headless --protector
libunoexceptionprotector.so unoexceptionprotector --protector
libunobootstrapprotector.so unobootstrapprotector
assets/unpack/filters_test.cmdline
#
# Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
cp $(ANDROID_NDK_GDBSERVER) $(SODEST)
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index eeb1d60..5971aee 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -153,6 +153,7 @@ certain functionality.
@section tools
@li @c tools.debug
+@li @c tools.rc - resource manager
@li @c tools.stream - SvStream class
@section ucb
diff --git a/sc/source/ui/vba/testvba/runTests.pl
b/sc/source/ui/vba/testvba/runTests.pl
index 5f32015..4f85abe 100644
--- a/sc/source/ui/vba/testvba/runTests.pl
+++ b/sc/source/ui/vba/testvba/runTests.pl
@@ -101,7 +101,6 @@ if ( !$failed open(UNAME, uname -a|) ) {
print $testPath\n;
$testPath = $ENV{PATH};
print $testPath\n;
- $ENV{STAR_RESOURCEPATH} = $officepath/basis3.0/program/resource;
$ENV{SAL_ALLOW_LINKOO_SYMLINKS} = 1;
$testPath = $ENV{LANG};
print $testPath\n;
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 6f6e096..61726f4 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -41,7 +41,6 @@ export LD_LIBRARY_PATH=$thisdir:$java_path:' . $moz_lib .
'$LD_LIBRARY_PATH
ulimit -c unlimited
export PATH=$thisdir:$thisdir/../ure-link/bin:$PATH
export GNOME_DISABLE_CRASH_DIALOG=1
-export STAR_RESOURCEPATH=$thisdir/resource
# debugging assistance
export SAL_DISABLE_FLOATGRAB=1
export G_SLICE=always-malloc
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index 9e348e7..c211b1c 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -359,7 +359,7 @@ gb_ResTarget_DEFIMAGESLOCATION :=
$(SRCDIR)/icon-themes/galaxy/
$(call gb_ResTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),RES,2)
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_ResTarget_get_target,$*) $(call
gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*))
+ rm -f $(call gb_ResTarget_get_target,$*) $(call
gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*)
$(call gb_ResTarget_get_unittest_target,$*))
$(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
$(gb_ResTarget_RSCDEPS)
@@ -390,17 +390,24 @@ $(call gb_ResTarget_get_target,%) :
$(gb_Helper_MISCDUMMY) \
$(call gb_ResTarget_get_outdir_target,%) :
$(call gb_Deliver_deliver,$,$@)
+$(call gb_ResTarget_get_unittest_target,%) :
+ $(call gb_Helper_abbreviate_dirs,mkdir -p $(dir $@))
+ $(call gb_Deliver_deliver,$,$@)
+
define
[Libreoffice-commits] .: vcl/android vcl/aqua vcl/headless vcl/inc vcl/ios vcl/source vcl/unx vcl/win
vcl/android/androidinst.cxx |1 -
vcl/aqua/source/app/salinst.cxx |6 --
vcl/headless/headlessinst.cxx |1 -
vcl/inc/salinst.hxx |1 -
vcl/ios/source/app/salinst.cxx|6 --
vcl/source/app/svmain.cxx |2 --
vcl/unx/generic/plugadapt/salplug.cxx |4
vcl/win/source/app/salinst.cxx|4
8 files changed, 25 deletions(-)
New commits:
commit eb7ccf863ce3e8f15e04f704bd90afa44fde
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jan 30 13:50:25 2013 +0100
Remove unused DeInitSalMain
Change-Id: I8fd733fe6535cc4f9f299f53adc1821ce344a85c
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 9eba26e..fc1c3f9 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -111,7 +111,6 @@ SalSystem *AndroidSalInstance::CreateSalSystem()
void InitSalData() {}
void DeInitSalData() {}
void InitSalMain() {}
-void DeInitSalMain() {}
void SalAbort( const rtl::OUString rErrorText, bool bDumpCore )
{
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 7c3009f..c0bc111 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -295,12 +295,6 @@ void InitSalMain()
{
}
-// ---
-
-void DeInitSalMain()
-{
-}
-
// ===
SalYieldMutex::SalYieldMutex()
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx
index 1d1f15e..0eb790d 100644
--- a/vcl/headless/headlessinst.cxx
+++ b/vcl/headless/headlessinst.cxx
@@ -82,7 +82,6 @@ public:
void InitSalData() {}
void DeInitSalData() {}
void InitSalMain() {}
-void DeInitSalMain() {}
void SalAbort( const OUString rErrorText, bool bDumpCore )
{
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index afa9e27..2c41bc8 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -199,7 +199,6 @@ void InitSalData(); // called from
Application-Ctor
void DeInitSalData(); // called from Application-Dtor
void InitSalMain();
-void DeInitSalMain();
// --
// - SVMain -
diff --git a/vcl/ios/source/app/salinst.cxx b/vcl/ios/source/app/salinst.cxx
index 6ff0e84..d99a18f 100644
--- a/vcl/ios/source/app/salinst.cxx
+++ b/vcl/ios/source/app/salinst.cxx
@@ -176,12 +176,6 @@ void InitSalMain()
// I doubt anything is needed on iOS
}
-// ---
-
-void DeInitSalMain()
-{
-}
-
// ===
SalYieldMutex::SalYieldMutex()
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 4fef497..9b83c6d 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -572,8 +572,6 @@ void DeInitVCL()
DeInitTools();
-DeInitSalMain();
-
if( pOwnSvApp )
{
delete pOwnSvApp;
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx
b/vcl/unx/generic/plugadapt/salplug.cxx
index 2b6b31f..87a5c05 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -268,10 +268,6 @@ void InitSalMain()
{
}
-void DeInitSalMain()
-{
-}
-
void SalAbort( const rtl::OUString rErrorText, bool bDumpCore )
{
if( rErrorText.isEmpty() )
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 4bfc9c1..aa449f2 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -471,10 +471,6 @@ void InitSalMain()
}
}
-void DeInitSalMain()
-{
-}
-
// ---
SalInstance* CreateSalInstance()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: idlc/source
idlc/source/parser.y |1 - 1 file changed, 1 deletion(-) New commits: commit f8569cd9a28a3a8856dba4ad53218aa6cc073521 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Jan 30 13:52:03 2013 +0100 UNO constants cannot be of CHAR type Change-Id: I13f2f1d38b99a5eb1d10f40c524894e37a47f7e2 diff --git a/idlc/source/parser.y b/idlc/source/parser.y index 629c2f2..3da099c 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -1508,7 +1508,6 @@ positive_int_expr : const_type : integer_type - | char_type | byte_type | boolean_type | floating_pt_type ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source editeng/source filter/source sccomp/source svtools/source svx/source
chart2/source/inc/macros.hxx |
3 ---
editeng/source/editeng/textconv.cxx|
2 --
filter/source/msfilter/msocximex.cxx |
2 --
sccomp/source/solver/solver.cxx|
2 --
svtools/source/config/colorcfg.cxx |
1 -
svtools/source/config/fontsubstconfig.cxx |
2 --
svtools/source/config/htmlcfg.cxx |
2 --
svx/source/dialog/rubydialog.cxx |
2 --
svx/source/dialog/svxbmpnumvalueset.cxx|
1 -
svx/source/smarttags/SmartTagMgr.cxx |
2 --
svx/source/table/accessibletableshape.cxx |
2 --
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx |
2 --
12 files changed, 23 deletions(-)
New commits:
commit 1475618fda02a0a2988ca5b9b7979b160399e168
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Jan 30 14:03:02 2013 +0100
remove useless macros
created by incorrect replacements in the previous commit
Change-Id: I15a56ecd201ce202fe933c7d24908923bedc6708
diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx
index 56e0643..e260832 100644
--- a/chart2/source/inc/macros.hxx
+++ b/chart2/source/inc/macros.hxx
@@ -21,9 +21,6 @@
#include typeinfo
-/// creates a unicode-string from an ASCII string
-#define constAsciiStr (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
constAsciiStr ) ))
-
/** shows an error-box for an exception ex
else-branch necessary to avoid warning
*/
diff --git a/editeng/source/editeng/textconv.cxx
b/editeng/source/editeng/textconv.cxx
index 710a24c..d8527cb 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -41,8 +41,6 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
using namespace com::sun::star::linguistic2;
-#define cChar OUString::createFromAscii(cChar)
-
//
TextConvWrapper::TextConvWrapper( Window* pWindow,
diff --git a/filter/source/msfilter/msocximex.cxx
b/filter/source/msfilter/msocximex.cxx
index abf8b26..18d08e4 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -30,8 +30,6 @@
using namespace ::com::sun::star;
using namespace ::rtl;
-#define cChar OUString(cChar)
-
OUString sWW8_form( WW-Standard );
SvxMSConvertOCXControls::SvxMSConvertOCXControls( const uno::Reference
frame::XModel rxModel) : mxModel(rxModel)
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index 660a806..0784fc9 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -62,8 +62,6 @@ using namespace com::sun::star;
using ::rtl::OUString;
-#define constAsciiStr (::rtl::OUString( constAsciiStr ))
-
#define STR_NONNEGATIVE NonNegative
#define STR_INTEGER Integer
#define STR_TIMEOUT Timeout
diff --git a/svtools/source/config/colorcfg.cxx
b/svtools/source/config/colorcfg.cxx
index c75a61b..7b13df8 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -48,7 +48,6 @@ using ::rtl::OUString;
namespace svtools
{
-#define cChar OUString::createFromAscii(cChar)
static const sal_Char cColor[] = /Color;
static const sal_Char cColorSchemes[] = ColorSchemes/;
sal_Int32nColorRefCount_Impl = 0;
diff --git a/svtools/source/config/fontsubstconfig.cxx
b/svtools/source/config/fontsubstconfig.cxx
index b70ebff..b54cac2 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -34,8 +34,6 @@ using namespace com::sun::star::beans;
using ::rtl::OUString;
-#define cChar OUString::createFromAscii(cChar)
-
const sal_Char cReplacement[] = Replacement;
const sal_Char cFontPairs[] = FontPairs;
diff --git a/svtools/source/config/htmlcfg.cxx
b/svtools/source/config/htmlcfg.cxx
index de02320..7cfcddf 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -43,8 +43,6 @@ using namespace com::sun::star::uno;
using ::rtl::OUString;
-#define cChar OUString::createFromAscii(cChar)
-
struct HtmlOptions_Impl
{
::std::listLink aList;
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 6b1e523..da49fde 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -51,8 +51,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::container;
using rtl::OUString;
-#define cChar rtl::OUString::createFromAscii(cChar)
-
SFX_IMPL_CHILDWINDOW( SvxRubyChildWindow, SID_RUBY_DIALOG );
static const sal_Char
[Libreoffice-commits] .: 2 commits - extensions/source svx/source
extensions/source/nsplugin/source/so_main.cxx |6 +++---
svx/source/xoutdev/xattr.cxx |4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 658467e3e10b88a07b6c0c326eec8d35b6cfb338
Author: Michael Stahl mst...@redhat.com
Date: Wed Jan 30 14:44:56 2013 +0100
Revert WaE: declaration of nWhich shadows a member of ´this´
This reverts commit 984ac8a7b4af06147a113845899ec918d5934921.
Problem was fixed already by 9ad661e5740142a95893e91e4c138caee2abe7c2
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 0651587..3607d5c 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -3169,8 +3169,8 @@ XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
*/
XFillGradientItem::XFillGradientItem(const OUString rName,
- const XGradient rTheGradient, sal_uInt16
nWhich_)
-: NameOrIndex(nWhich_, rName)
+ const XGradient rTheGradient, sal_uInt16
nWhich)
+: NameOrIndex(nWhich, rName)
, aGradient(rTheGradient)
{
}
commit abfd688a7d57ada10072bd876b9a85f709ea4007
Author: Michael Stahl mst...@redhat.com
Date: Wed Jan 30 14:43:46 2013 +0100
extensions: fix wrongly converted OUString literals
Change-Id: I23594fe715fbd8d34ea5d938bde963a17dffb296
diff --git a/extensions/source/nsplugin/source/so_main.cxx
b/extensions/source/nsplugin/source/so_main.cxx
index 5d46e35..054fd77 100644
--- a/extensions/source/nsplugin/source/so_main.cxx
+++ b/extensions/source/nsplugin/source/so_main.cxx
@@ -321,9 +321,9 @@ Reference lang::XMultiServiceFactory SAL_CALL
start_office(NSP_PIPE_FD read_f
// arguments
OUString args [] = {
---nologo,
---nodefault,
---nolockcheck,
+OUString(--nologo),
+OUString(--nodefault),
+OUString(--nolockcheck),
sConnectStartString,
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Change in core[master]: convert mysqlc to gbuild and add to tail_build
On 30/01/13 11:46, Alex Thurgood wrote: Le 28/01/2013 23:54, Michael Stahl (via Code Review) a écrit : Hi all, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1901 Approvals: Michael Stahl: Verified; Looks good to me, approved Something in one of these 2 mysql commits now causes a build failure on Mac OSX, because the configure macro forces a search for libmyqsl16.dylib in the wrong place. On OSX, you have to build the connector using the --with-libmysql-path switch as the source code libraries are not supplied by Apple in its version of mysql server (they have to be sourced from mysql). configure.ac looks for a lib/libmysql.dylib but the only change here is an inserted PathFormat, which only does something on Cygwin. neither Peter nor myself have a Mac so it wasn't tested on that platform... tinderboxes apparently build successfully but i guess they have MySQL stuff disabled. needs somebody with a Mac to fix it. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - cli_ure/source forms/source
cli_ure/source/climaker/climaker_emit.cxx |2 +- forms/source/xforms/resourcehelper.cxx|8 +++- 2 files changed, 4 insertions(+), 6 deletions(-) New commits: commit 1ba8986446dbaa77c9aed6d141ee99da74bf1afb Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Jan 30 15:12:34 2013 +0100 fix for the awkward OUString::replaceAll() behaviour Change-Id: I6ee919bb17ea7eb29cb9cfc0fc69d02d728d9a0f diff --git a/forms/source/xforms/resourcehelper.cxx b/forms/source/xforms/resourcehelper.cxx index a39f767..50cd74f 100644 --- a/forms/source/xforms/resourcehelper.cxx +++ b/forms/source/xforms/resourcehelper.cxx @@ -55,12 +55,10 @@ OUString getResource( sal_uInt16 nResourceId, OUString sResource = frm::ResourceManager::loadString( nResourceId ); OSL_ENSURE( !sResource.isEmpty(), resource not found? ); -// use old style String class for search and replace, so we don't have to -// code this again. OUString sString( sResource ); -sString.replaceAll( $1, rInfo1 ); -sString.replaceAll( $2, rInfo2 ); -sString.replaceAll( $3, rInfo3 ); +sString = sString.replaceAll( $1, rInfo1 ); +sString = sString.replaceAll( $2, rInfo2 ); +sString = sString.replaceAll( $3, rInfo3 ); return sString; } commit ce22d30eeb6fcd3dfcf3fe3c67adeaddb0d97017 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Jan 30 15:09:48 2013 +0100 do not try to concatenate two string literals using + Change-Id: I7f06a9b065d5dd24da48e06792cacd27d157a656 diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx index cb4e427..fcefc26 100644 --- a/cli_ure/source/climaker/climaker_emit.cxx +++ b/cli_ure/source/climaker/climaker_emit.cxx @@ -1140,7 +1140,7 @@ Assembly ^ TypeEmitter::type_resolve( const OUString sType(entry-m_xType-getName()); const OUString sMemberName(pseq_member_names[i]); if ( ! pseq_members[i].is()) -throw RuntimeException(Missing type description . Check if you need to + +throw RuntimeException(Missing type description . Check if you need to specify additional RDBs with the --extra option. Type missing for: + sType + :: + sMemberName,0); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - extensions/source lingucomponent/source sal/inc
extensions/source/ole/oleobjw.cxx | 12 -
extensions/source/ole/unoconversionutilities.hxx|2 -
extensions/source/ole/unoobjw.cxx | 16 ++--
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm |4 +--
sal/inc/sal/types.h |2 -
5 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 5443d6486215f12b6538b07c1f354c5a023df0cf
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Jan 30 16:10:30 2013 +0100
fix string literals concatenation
Change-Id: I2dc86b3c24f22f4e52e25152a5741ecefad9c7d3
diff --git a/extensions/source/ole/oleobjw.cxx
b/extensions/source/ole/oleobjw.cxx
index 58ed1ab..d1a6b74 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -2495,12 +2495,12 @@ void IUnknownWrapper_Impl::buildComTlbIndex()
}
else
{
-sError = [automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, \
+sError = [automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex,
ITypeInfo::GetNames failed.;
}
}
else
-sError = [automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, \
+sError = [automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex,
ITypeInfo::GetFuncDesc failed.;
}
@@ -2524,18 +2524,18 @@ void IUnknownWrapper_Impl::buildComTlbIndex()
}
else
{
-sError = [automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, \
- ITypeInfo::GetNames failed.;
+sError = [automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex,
+ ITypeInfo::GetNames failed.;
}
}
else
-sError = [automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, \
+sError = [automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex,
ITypeInfo::GetVarDesc failed.;
}
}
else
-sError = [automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex, \
+sError = [automation bridge]
IUnknownWrapper_Impl::buildComTlbIndex,
ITypeInfo::GetTypeAttr failed.;
if (sError.getLength())
diff --git a/extensions/source/ole/unoconversionutilities.hxx
b/extensions/source/ole/unoconversionutilities.hxx
index e38f400..696866f 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -643,7 +643,7 @@ void UnoConversionUtilitiesT::anyToVariant(VARIANT*
pVariant, const Any rAny,
throw BridgeRuntimeError(
[automation
bridge]UnoConversionUtilitiesT::anyToVariant \n
-Conversion of any with +
+Conversion of any with +
rAny.getValueType().getTypeName() +
to VARIANT with type: + OUString::valueOf((sal_Int32)
type) +
failed! Error code: + OUString::valueOf(hr));
diff --git a/extensions/source/ole/unoobjw.cxx
b/extensions/source/ole/unoobjw.cxx
index b4cacc9..9bd7a4a 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -401,7 +401,7 @@ void InterfaceOleWrapper_Impl::convertDispparamsArgs(DISPID
id,
if( FAILED( hr))
{
throw BridgeRuntimeError(
-[automation bridge] Could not determine +
+[automation bridge] Could not determine
if the object has a member \0\. Error: +
OUString::valueOf(hr));
}
@@ -885,7 +885,7 @@ STDMETHODIMP InterfaceOleWrapper_Impl::Invoke(DISPID
dispidMember,
}
catch(...)
{
-OUString message= InterfaceOleWrapper_Impl::Invoke : \n +
+OUString message= InterfaceOleWrapper_Impl::Invoke : \n
Unexpected exception;
writeExcepinfo(pexcepinfo, message);
ret = DISP_E_EXCEPTION;
@@ -978,7 +978,7 @@ HRESULT InterfaceOleWrapper_Impl::doInvoke( DISPPARAMS *
pdispparams, VARIANT *
}
catch( ... )
{
-OUString message= InterfaceOleWrapper_Impl::doInvoke : \n +
+OUString message=
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 59916, which changed state. Bug 59916 Summary: French, Dutch and Czech UI cause ERROR:508 instead calculated results https://bugs.freedesktop.org/show_bug.cgi?id=59916 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |NOTOURBUG -- 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
Re: [Libreoffice-commits] replaceAll
On 01/30/2013 03:13 PM, Libreoffice Gerrit user wrote: commit 1ba8986446dbaa77c9aed6d141ee99da74bf1afb Author: Luboš Luňák l.lu...@suse.cz Date: Wed Jan 30 15:12:34 2013 +0100 fix for the awkward OUString::replaceAll() behaviour Change-Id: I6ee919bb17ea7eb29cb9cfc0fc69d02d728d9a0f diff --git a/forms/source/xforms/resourcehelper.cxx b/forms/source/xforms/resourcehelper.cxx index a39f767..50cd74f 100644 --- a/forms/source/xforms/resourcehelper.cxx +++ b/forms/source/xforms/resourcehelper.cxx @@ -55,12 +55,10 @@ OUString getResource( sal_uInt16 nResourceId, OUString sResource = frm::ResourceManager::loadString( nResourceId ); OSL_ENSURE( !sResource.isEmpty(), resource not found? ); -// use old style String class for search and replace, so we don't have to -// code this again. OUString sString( sResource ); -sString.replaceAll( $1, rInfo1 ); -sString.replaceAll( $2, rInfo2 ); -sString.replaceAll( $3, rInfo3 ); +sString = sString.replaceAll( $1, rInfo1 ); +sString = sString.replaceAll( $2, rInfo2 ); +sString = sString.replaceAll( $3, rInfo3 ); return sString; } Seeing this, that's the reason I've always been unhappy with such a replaceAll function: While it may appear obviously useful, it easily leads to broken code (like if rInfo1 is wanna bet $2 this doesn't work?, say, in the above snippet). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: desktop/source sal/inc
desktop/source/app/app.cxx | 23 +--
sal/inc/osl/file.hxx | 18 ++
2 files changed, 31 insertions(+), 10 deletions(-)
New commits:
commit 1e33b3dc73e96c6c005d13e20c3f546fcb301ed8
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jan 30 16:29:27 2013 +0100
osl::{File,Directory}::getURL() had curiously been missing
Change-Id: I0af83e7aeaf681440d4bbb50d8b00390f8464b1a
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index e384912..c541566 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -156,7 +156,8 @@ void removeTree(OUString const url) {
case osl::FileBase::E_NOENT:
return; //TODO: SAL_WARN if recursive
default:
-SAL_WARN(desktop, cannot open directory url : +rc);
+SAL_WARN(
+desktop, cannot open directory dir.getURL() :
+rc);
return;
}
for (;;) {
@@ -167,7 +168,8 @@ void removeTree(OUString const url) {
}
if (rc != osl::FileBase::E_None) {
SAL_WARN(
-desktop,cannot iterate directory url : +rc);
+desktop,
+cannot iterate directory dir.getURL() : +rc);
break;
}
osl::FileStatus stat(
@@ -176,7 +178,8 @@ void removeTree(OUString const url) {
rc = i.getFileStatus(stat);
if (rc != osl::FileBase::E_None) {
SAL_WARN(
-desktop, cannot stat in directory url : +rc);
+desktop,
+cannot stat in directory dir.getURL() : +rc);
continue;
}
if (stat.getFileType() == osl::FileStatus::Directory) { //TODO:
symlinks
@@ -192,7 +195,7 @@ void removeTree(OUString const url) {
rc = dir.close();
SAL_WARN_IF(
rc != osl::FileBase::E_None, desktop,
-cannot close directory url : +rc);
+cannot close directory dir.getURL() : +rc);
}
rc = osl::Directory::remove(url);
SAL_WARN_IF(
@@ -249,11 +252,11 @@ bool cleanExtensionCache() {
osl::FileBase::RC rc2 = fr.close();
SAL_WARN_IF(
rc2 != osl::FileBase::E_None, desktop,
-cannot close buildIdFile after reading: +rc2);
+cannot close fr.getURL() after reading: +rc2);
if (rc != osl::FileBase::E_None) {
SAL_WARN(
desktop,
-cannot read from buildIdFile : +rc);
+cannot read from fr.getURL() : +rc);
break;
}
OUString s2(
@@ -271,7 +274,7 @@ bool cleanExtensionCache() {
default:
SAL_WARN(
desktop,
-cannot open buildIdFile for reading: +rc);
+cannot open fr.getURL() for reading: +rc);
break;
}
removeTree(extDir);
@@ -292,7 +295,7 @@ bool cleanExtensionCache() {
if (rc != osl::FileBase::E_None) {
SAL_WARN(
desktop,
-cannot open buildIdFile for writing: +rc);
+cannot open fw.getURL() for writing: +rc);
return true;
}
OString buf(OUStringToOString(buildId, RTL_TEXTENCODING_UTF8));
@@ -305,11 +308,11 @@ bool cleanExtensionCache() {
(rc != osl::FileBase::E_None
|| n != static_cast sal_uInt32 (buf.getLength())),
desktop,
-cannot write to buildIdFile : +rc , n);
+cannot write to fw.getURL() : +rc , n);
rc = fw.close();
SAL_WARN_IF(
rc != osl::FileBase::E_None, desktop,
-cannot close buildIdFile after writing: +rc);
+cannot close fw.getURL() after writing: +rc);
return true;
}
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 7a61afe..5c9a268 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -935,6 +935,15 @@ public:
close();
}
+/** Obtain the URL.
+
+@return
+the URL with which this File instance was created.
+
+@since LibreOffice 4.1
+*/
+inline rtl::OUString getURL() const { return _aPath; }
+
/** Open a regular file.
Open a file. Only regular files can be openend.
@@ -1673,6 +1682,15 @@ public:
close();
}
+/** Obtain the URL.
+
+@return
+the URL with which this Directory instance was created.
+
+@since LibreOffice 4.1
+*/
+inline rtl::OUString getURL() const { return _aPath; }
+
/** Open a directory for enumerating its contents.
@return
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - formula/source sc/source
formula/source/core/resource/core_resource.src |2 +-
sc/source/core/tool/compiler.cxx |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 05d97f486fc1db564d9c7b372ba2e7a867502c80
Author: Eike Rathke er...@redhat.com
Date: Wed Jan 30 01:42:47 2013 +0100
ODFF: write RRI as RRI, not ZGZ, fdo#60077
ODF OpenFormula defines the function RRI, the legacy OOo XML format
stored that as ZGZ but that was not changed for the ODFF implementation.
Correctly read/write RRI now but still accept ZGZ to be able to load
existing documents.
See also
http://docs.oasis-open.org/office/v1.2/cs01/OpenDocument-v1.2-cs01-part2.html#RRI
Change-Id: I617eaa37ff483e9a02a218e8432ba918f54bd61a
(cherry picked from commit 8f9cb32ffe95ebd9934ddafc666a8df854bd)
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index d21a737..f02f806 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -210,7 +210,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_COLUMN { Text = COLUMN ; };
String SC_OPCODE_ROW { Text = ROW ; };
String SC_OPCODE_TABLE { Text = SHEET ; };
-String SC_OPCODE_ZGZ { Text = ZGZ ; };
+String SC_OPCODE_ZGZ { Text = RRI ; };
String SC_OPCODE_ZW { Text = FV ; };
String SC_OPCODE_ZZR { Text = NPER ; };
String SC_OPCODE_ZINS { Text = RATE ; };
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 74c2be9..597743a 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2469,7 +2469,8 @@ bool ScCompiler::IsOpCode( const String rName, bool
bInArray )
// Renamed old names:
{ B, ocB }, // B - BINOM.DIST.RANGE
{ TDIST, ocTDist }, // TDIST - LEGACY.TDIST
-{ EASTERSUNDAY, ocEasterSunday }// EASTERSUNDAY -
ORG.OPENOFFICE.EASTERSUNDAY
+{ EASTERSUNDAY, ocEasterSunday }, // EASTERSUNDAY -
ORG.OPENOFFICE.EASTERSUNDAY
+{ ZGZ,ocZGZ } // ZGZ - RRI
// Renamed new names:
// XXX none currently. Example:
//{ ORG.OPENOFFICE.EASTERSUNDAY, ocEasterSunday }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Code pointers for fdo#43650
Hi Cedric, thanks, that information is helpful. I found the code in VCL for the scrollbar. When I've got some time, I'll try to get familiar with gdb and have a closer look at it. Samuel Am 28.01.2013 13:31, schrieb Cedric Bosdonnat: Hi Samuel, On Sat, 2013-01-26 at 11:21 +0100, Samuel Mehrbrodt wrote: I would like to work on Bug #43650 [1]. The bug is about disabling the tooltip showing Title/Page number when scrolling in Writer. But it should only be disabled when scrolling with the mouse wheel, not when dragging the scroll bar. From this Apache patch [2] I can see where the tool tip is drawn. What I want to do different than Apache does, is that whether the tool tip is shown or not, should not be based on a configuration setting, but on whether one is using the mouse wheel. Can someone please have a look at it and give me a code pointer for that? The ScollbarHdl doesn't tell you how this has been triggered. I think you'll have to have a look at the ScrollBar vcl control to add that information... Some debugging may also help to see the difference between scrolling with the wheel or by dragging the lift. I hope this helps, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.3'
Tag 'libreoffice-4.0.0.3' created by Petr Mladek pmla...@suse.cz at 2013-01-30 16:02 -0800 Tag libreoffice-4.0.0.3 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRCUQpAAoJEPQ0oe+v7q6j9l8P/Ane9CBVjsdZ0NEKmg/e+Yzb SjrEE6ToL2R2SMzEiW5QdQR/sn0GwEUja3QCMBkXslCwlWf8J+THdW64htl6nSWj bB6DOqzgwVSRxfqDRIsNGjFbO5zcp3DZ7SjHSfSL2/Bn75SuHmGkJC1q1eHTHQxs kq9UEncxlIAlRJquyKb5LpOUCD7zLowKEYVr98G5Wxq2zJtlr0nAzGLWXlmj+/xb FIW7Kb8faiykq5hHKaFC3lqf8FE+DpkrI9UzEE3LZYGV5v3M3vHV5F+N2Qvl/ZFj 3uGljvn92x7lPntfbt1/geOtmXZmk6qAkgynC1z9d9vCZ36Hr65jdRE+dB+Ef07O d6OX3ZD/FCyrAj9xntlbGkr7e9vG2zHJ0FqXcTMpKDgU5yo6clGe45SxB8SnEz5t m3Twloo28GByt9TAK0iKyc+StrQG66U7kqBfykFYklIkI3wJWCvuuga16FasrlqS dISeDWB7BCY2V+kA94ja+cmbHCxJiVPdSbJS32pdtFNqnmRVvLuTZeOZ6o9TmPeW b1JKMMryMeys04SktCuP3Qyqg0Aa7pWuEQQr1kJxmtDDX2eg2mbe2yKMNssov7uN m5YlMX/8lr/t0xdnJxOSGgMX16vaQGRbQYvF3PaQnpJnITJX092IaIlxL27B+Tmc 3u3GMdQBxLA6Zk+b1qP+ =9TXV -END PGP SIGNATURE- Changes since libreoffice-4-0-branch-point-8: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.3'
Tag 'libreoffice-4.0.0.3' created by Petr Mladek pmla...@suse.cz at 2013-01-30 16:02 -0800 Tag libreoffice-4.0.0.3 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRCURKAAoJEPQ0oe+v7q6jJd4QALPmfSbfend8M8GnuH1U3rxL ss+KJRi/fjf7Ialab9QC/5ot1izrS5CXiI4v4JuZT28IxnfDTfS6fWwbax0qYdpA svmZOTzXg+n+6XI0aBQT5W7aQhUzyRRKoTRsipQDf+yWUBzP0WjmgTyM29q0isJ1 5u5yhP6k24pHAVus4rLXyBBdqCbPWqb+gAZQ8gkn2ugDweRi1aimGf9Xe88Gv+YC oPFHNw4AVvUJ06yhic797ytPQVqS7TmYBZIFGJqpyg786Nht+rfHPtck3txPu6XS MZwTHxaUjdZdY1Xa9o5w1qKgQjYCakjV3HE8SzdthHsBJA/65owwbvqJCxrP4M8Q rPXd0aKUGWeXcxpBBeEdvnWaFp0f+dILQ5g9iGNRYM0k62N6W8OToSK/sjl1bOX6 0Sm3jEIQVfIhqRHMekfOTAv0Hh25GE1nXK1HLpowztMBIWHivFuvR0phpICbfrHe YAJKg4NhVT+h3tvc+N8XZabBeWxxCUl5S0JPw0tqablUmRIVutIvgxqSBZyVrSWG 8vQLhTNJBfu5zA/KFdc61cYAMw/PnuuhZPsVpyJikQgm9BBcHtZRAuzn4a8flADB PwOVtjqXUJ7zrEeZzvSG4Y9I7119jhFLEbrYqly6omrFvl/H8YjpO0lIgHN3k6Yj tMzK3ltljDn8ChdJIasO =jZv7 -END PGP SIGNATURE- Changes since libreoffice-4-0-branch-point-12: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.3'
Tag 'libreoffice-4.0.0.3' created by Petr Mladek pmla...@suse.cz at 2013-01-30 16:03 -0800 Tag libreoffice-4.0.0.3 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJRCURZAAoJEPQ0oe+v7q6j4vwP/R8unbmNZLHZVDGJfeOFE23e B/o7onvKmzPA5nng5RwDh+v5IOmYHPFlrLnBb7f5epTmQExVMce/xh28UzbwkSuO G5guBaZL1k6kIezJLeupkewSB7FmcCiHwgtIdZQxfLxeTLs7XN2TXGQGDUcSYqDa RoQXEXBlLqF9u0EtcjlnTqnYNI1Cj6z7pnb49DGLVrLaaV3SWs+g+lOXMwpGrRpG DZohgDih0vu3j1+lAjUza7zPaL6i7ntq29QFJebufZQcX49YwDZrXIshZjXnYbHK 3gaoXD0ajcrQCoTe7coRPYgEBU8kbXzk3A1IXMbmSXgyyY4csnDScnqAXYUHiqfd sFlE3vkCM8t2HosMXNI7A86C3ug5ope+2A3lAuoNRVRMlHX10rPdOMebfkCjIvjj I1vPmE2zdbR1mIySj1wPyPwrgppjIFPUqI/L6TrXdwg0chhD2pjTYRGwDmiRdalh 7KNeICI/I59tic+hFersMnDBcZ/9JLOnALnBMA+Ub8N6x7FT2TZwHwHPrn7Vw2j5 2ul9rpfGqzKRLxcF2EaOMhBSyktpLqbx9uQ9T0Ec8HGACAVWmMtUEsadAJ+qIZpE 4ieJIF2BQ+hl8v4LhfJyabv6nZ81gxJf1ib/CXPmf7PAse2SamTvpvs5oJH5RKIZ des2sgqxuSfzkUu0fnbI =nl4u -END PGP SIGNATURE- Changes since libreoffice-4-0-branch-point-19: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source sw/qa
oox/inc/oox/vml/vmlshape.hxx | 15 +++--
oox/source/vml/vmlshape.cxx| 23 +++---
sw/qa/extras/ooxmlimport/data/groupshape-line.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 33 +
4 files changed, 57 insertions(+), 14 deletions(-)
New commits:
commit 7877638814de86202d33b5653a0f91d63341e98c
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Jan 30 16:43:35 2013 +0100
n#792778 oox: implement import of v:line inside v:group
The problem was that in ShapeBase::convertAndInsert(), the rectangle
calculated for a line was zero, that's why it wasn't imported. Fix this
by overriding the get*Rectangle() methods in LineShape, instead of doing
so with implConvertAndInsert().
Change-Id: Ie4bb2f7964b438cb56e4f5ee7a4ebe9f8f8eb734
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 1ef3058..8373d4f 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -128,12 +128,10 @@ protected:
::com::sun::star::awt::Rectangle getCoordSystem() const;
/** Returns the absolute shape rectangle according to the passed anchor. */
::com::sun::star::awt::Rectangle getRectangle( const ShapeParentAnchor*
pParentAnchor ) const;
-
-private:
/** Returns the absolute shape rectangle. */
-::com::sun::star::awt::Rectangle getAbsRectangle() const;
+virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const;
/** Returns the rectangle relative to the parent coordinate system. */
-::com::sun::star::awt::Rectangle getRelRectangle() const;
+virtual ::com::sun::star::awt::Rectangle getRelRectangle() const;
protected:
DrawingmrDrawing; /// The VML drawing page that
contains this shape.
@@ -341,11 +339,10 @@ public:
explicitLineShape( Drawing rDrawing );
protected:
-/** Creates the corresponding XShape and inserts it into the passed
container. */
-virtual ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape
-implConvertAndInsert(
-const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShapes rxShapes,
-const ::com::sun::star::awt::Rectangle rShapeRect
) const;
+/** Returns the absolute shape rectangle. */
+virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const;
+/** Returns the rectangle relative to the parent coordinate system. */
+virtual ::com::sun::star::awt::Rectangle getRelRectangle() const;
};
/** Bezier shape object that supports to, from, control1 and control2
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 8341f19..b7b1c5c 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -297,7 +297,6 @@ Reference XShape ShapeBase::convertAndInsert( const
Reference XShapes rxS
according to some imported shape client data (e.g. Excel cell
anchor). */
awt::Rectangle aShapeRect = calcShapeRectangle( pParentAnchor );
-// convert the shape, if the calculated rectangle is not empty
if( ((aShapeRect.Width 0) || (aShapeRect.Height 0))
rxShapes.is() )
{
xShape = implConvertAndInsert( rxShapes, aShapeRect );
@@ -320,6 +319,8 @@ Reference XShape ShapeBase::convertAndInsert( const
Reference XShapes rxS
mrDrawing.notifyXShapeInserted( xShape, aShapeRect, *this,
bGroupChild );
}
}
+else
+SAL_WARN(oox, not converting shape, as calculated rectangle is
empty);
}
return xShape;
}
@@ -637,10 +638,10 @@ LineShape::LineShape(Drawing rDrawing)
{
}
-ReferenceXShape LineShape::implConvertAndInsert(const ReferenceXShapes
rxShapes, const awt::Rectangle rShapeRect) const
+awt::Rectangle LineShape::getAbsRectangle() const
{
const GraphicHelper rGraphicHelper =
mrDrawing.getFilter().getGraphicHelper();
-awt::Rectangle aShapeRect(rShapeRect);
+awt::Rectangle aShapeRect;
sal_Int32 nIndex = 0;
aShapeRect.X = ConversionHelper::decodeMeasureToHmm(rGraphicHelper,
maShapeModel.maFrom.getToken(0, ',', nIndex), 0, true, true);
@@ -648,8 +649,20 @@ ReferenceXShape LineShape::implConvertAndInsert(const
ReferenceXShapes rxSh
nIndex = 0;
aShapeRect.Width = ConversionHelper::decodeMeasureToHmm(rGraphicHelper,
maShapeModel.maTo.getToken(0, ',', nIndex), 0, true, true) - aShapeRect.X;
aShapeRect.Height = ConversionHelper::decodeMeasureToHmm(rGraphicHelper,
maShapeModel.maTo.getToken(0, ',', nIndex), 0, false, true) - aShapeRect.Y;
+return aShapeRect;
+}
-return SimpleShape::implConvertAndInsert(rxShapes, aShapeRect);
+awt::Rectangle LineShape::getRelRectangle() const
+{
+awt::Rectangle aShapeRect;
+sal_Int32 nIndex = 0;
+
+aShapeRect.X = maShapeModel.maFrom.getToken(0, ',', nIndex).toInt32();
+
Change in core[master]: Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1924 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1924 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jean-Noël Rouvignac jn.rouvig...@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: ODFF: write RRI as RRI, not ZGZ, fdo#60077
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1922 -- To view, visit https://gerrit.libreoffice.org/1922 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I617eaa37ff483e9a02a218e8432ba918f54bd61a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: scaddins/source
scaddins/source/analysis/analysishelper.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit b884c2e0185e24fc498827b3a53becea9e646b85 Author: Regina Henschel rb.hensc...@t-online.de Date: Wed Jan 30 17:34:27 2013 +0100 resolved fdo#60078 correctly calculate IMCSCH and IMSECH For the transformation used see http://de.wikipedia.org/wiki/Sekans_Hyperbolicus_und_Kosekans_Hyperbolicus#Komplexes_Argument (German only) Change-Id: If502b708069d7fcbe09e954b26ce8b7268b6 diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 08a0967..8fddc7b 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -2075,8 +2075,8 @@ void Complex::Sech(void) THROWDEF_RTE_IAE THROW_IAE; double fScale =1.0 / ( cosh( 2.0 * r ) + cos( 2.0 * i )); double r_; -r_ = 2.0 * cosh( 2.0 * r ) * cos( i ) * fScale; -i = - (2.0 * sinh( 2.0 * r ) * sin( i ) * fScale ); +r_ = 2.0 * cosh( r ) * cos( i ) * fScale; +i = - (2.0 * sinh( r ) * sin( i ) * fScale ); r = r_ ; } else @@ -2096,8 +2096,8 @@ void Complex::Csch(void) THROWDEF_RTE_IAE THROW_IAE; double fScale =1.0 / ( cosh( 2.0 * r ) - cos( 2.0 * i )); double r_; -r_ = 2.0 * sinh( 2.0 * r ) * cos( i ) * fScale; -i = - ( 2.0 * cosh( 2.0 * r ) * sin( i ) * fScale ); +r_ = 2.0 * sinh( r ) * cos( i ) * fScale; +i = - ( 2.0 * cosh( r ) * sin( i ) * fScale ); r = r_ ; } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: chart2/source
chart2/source/view/charttypes/VSeriesPlotter.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 0bfa66cdf21fed70828e778c99161bc9005d0457
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Jan 30 17:40:04 2013 +0100
MSVC needs explicit OUString in ?:
Change-Id: I9b7db931ea9bd31824bd27f528c2b6214e80924b
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 3caa660..d32638c 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -642,8 +642,8 @@ double lcl_getErrorBarLogicLength(
{
double fPercent = 0;
if( xProp-getPropertyValue( bPositive
- ? PositiveError
- : NegativeError) = fPercent )
+ ? OUString(PositiveError)
+ : OUString(NegativeError) ) =
fPercent )
{
if( nIndex =0 nIndex rData.getLength()
! ::rtl::math::isNan( rData[nIndex] )
@@ -656,16 +656,16 @@ double lcl_getErrorBarLogicLength(
break;
case ::com::sun::star::chart::ErrorBarStyle::ABSOLUTE:
xProp-getPropertyValue( bPositive
- ? PositiveError
- : NegativeError) = fResult;
+ ? OUString(PositiveError)
+ : OUString(NegativeError) ) =
fResult;
break;
case ::com::sun::star::chart::ErrorBarStyle::ERROR_MARGIN:
{
// todo: check if this is really what's called error-margin
double fPercent = 0;
if( xProp-getPropertyValue( bPositive
- ? PositiveError
- : NegativeError) = fPercent )
+ ? OUString(PositiveError)
+ : OUString(NegativeError) ) =
fPercent )
{
double fMaxValue;
::rtl::math::setInf(fMaxValue, true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
how many oleautobridges do we need to ship?
in the extensions module we currently build 2 Library_oleautobridge.
only difference seems to be one is built with -DOWNGUID.
#ifndef OWNGUID
// GUID used since 5.2 ( src569 m)
// {82154420-0FBF-11d4-8313-005004526AB4}
DEFINE_GUID(OID_ServiceManager, 0x82154420, 0xfbf, 0x11d4, 0x83, 0x13, 0x0,
0x50, 0x4, 0x52, 0x6a, 0xb4);
#else
// Alternative GUID
// {D9BB9D1D-BFA9-4357-9F11-9A2E9061F06E}
DEFINE_GUID(OID_ServiceManager, 0xd9bb9d1d, 0xbfa9, 0x4357, 0x9f, 0x11, 0x9a,
0x2e, 0x90, 0x61, 0xf0, 0x6e);
#endif
#ifndef OWNGUID
sal_Bool bOLERegister = sal_False;
#else
sal_Bool bOLERegister = sal_True;
#endif
sal_Bool ret = provideInstance( m_smgr, (GUID*)OID_ServiceManager,
bOLERegister );
the reference is probably to StarOffice 5.2, which is ... obsolete.
apparently it was introduced by db7e35b7fddbb7067be8bb38c526beade25abd72
INTEGRATION: CWS c15v2_SRC680 (1.15.104); FILE MERGED
2007/02/21 11:20:58 rt 1.15.104.1: #143485# Joined from CWS c15v1.
which is quite un-helpful.
since i don't know anything about this OLE stuff anyway, is there any
reason not to get rid of the OWNGUID case?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANNOUNCE] libreoffice-4.0.0.3 tag created
Hi,
there have been created the tag libreoffice-4.0.0.3, aka rc3. The
corresponding official builds will be available within next few days.
It will be used as final if no blocker is found.
See the attached list of changes against 4.0.0.2.
Now, you might switch your current 4-0 source tree to it using:
./g fetch --tags
./g checkout -b tag-libreoffice-4.0.0.3 libreoffice-4.0.0.3
Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will be available from the official page together with the builds.
See also the schedule at
http://wiki.documentfoundation.org/ReleasePlan#4.0_release
and release criteria at http://wiki.documentfoundation.org/Release_Criteria
Best Regards,
Petr
bnc#798271 Charts are not visible after save [Kohei Yoshida]
fdo#57061 No personal data imported (or moved) during install from /3 User Profile [Stephan Bergmann]
fdo#58562 EDITING: copy and paste of CHART from Calc looses Y values [Kohei Yoshida]
fdo#59056 Charts are moved between sheets when saving a spreadsheet created with 3.6 [Kohei Yoshida]
fdo#59193 automatic row height does not work after import [Markus Mohrhard]
fdo#59325 Buttons disappeared in calc [Noel Power]
fdo#59422 [LOCALIZATION] Personas Dialog shows pt-PT strings in pt-BR locale. [Caolán McNamara]
fdo#59586 EDITING: Missing comma in particular PDF file (regression) [Caolán McNamara]
fdo#59724 FILEOPEN: Inherited currency format not retained through close and open [Markus Mohrhard]
fdo#59728 Python 3 loads utf-8 encoded files as CP-1252 encoded files [Stephan Bergmann]
fdo#59779 Double click on page style name in Styles and Formatting does not work [Cédric Bosdonnat]
fdo#59798 CONFIGURATION: Wrong Version info 4.0 .0.2 [Michael Stahl]
fdo#59819 FILESAVE: .xlsx: new functions (AVERAGEIF,AVERAGEIFS,COUNTIFS,SUMIFS,IFERROR,IFNA) lead to warning in Excel 2013, and IFNA is not accepted [Eike Rathke]
fdo#59881 sdremote - deadlock ... [Michael Meeks]
fdo#59931 Crash when starting wizard if icons set has been changed [Arnaud Versini]
fdo#59965 UI: program crash dialog looks unfinished [Caolán McNamara]
fdo#59969 Clear screen during Logo program execution can crash LibreOffice [László Németh]
* {{bnc|798271}} Charts are not visible after save [Kohei Yoshida]
* {{fdo|57061}} No personal data imported (or moved) during install from /3
User Profile [Stephan Bergmann]
* {{fdo|58562}} EDITING: copy and paste of CHART from Calc looses Y values
[Kohei Yoshida]
* {{fdo|59056}} Charts are moved between sheets when saving a spreadsheet
created with 3.6 [Kohei Yoshida]
* {{fdo|59193}} automatic row height does not work after import [Markus
Mohrhard]
* {{fdo|59325}} Buttons disappeared in calc [Noel Power]
* {{fdo|59422}} [LOCALIZATION] Personas Dialog shows pt-PT strings in pt-BR
locale. [Caolán McNamara]
* {{fdo|59586}} EDITING: Missing comma in particular PDF file (regression)
[Caolán McNamara]
* {{fdo|59724}} FILEOPEN: Inherited currency format not retained through close
and open [Markus Mohrhard]
* {{fdo|59728}} Python 3 loads utf-8 encoded files as CP-1252 encoded files
[Stephan Bergmann]
* {{fdo|59779}} Double click on page style name in Styles and Formatting does
not work [Cédric Bosdonnat]
* {{fdo|59798}} CONFIGURATION: Wrong Version info 4.0 .0.2 [Michael Stahl]
* {{fdo|59819}} FILESAVE: .xlsx: new functions
(AVERAGEIF,AVERAGEIFS,COUNTIFS,SUMIFS,IFERROR,IFNA) lead to warning in Excel
2013, and IFNA is not accepted [Eike Rathke]
* {{fdo|59881}} sdremote - deadlock ... [Michael Meeks]
* {{fdo|59931}} Crash when starting wizard if icons set has been changed
[Arnaud Versini]
* {{fdo|59965}} UI: program crash dialog looks unfinished [Caolán McNamara]
* {{fdo|59969}} Clear screen during Logo program execution can crash
LibreOffice [László Németh]
+ common
+ version 4.0.0.3, tag libreoffice-4.0.0.3 [Petr Mladek]
+ core
+ add link to additional sdk-examples [Stephan Bergmann]
+ class vs struct mismatch [Luboš Luňák]
+ crash dialog title area text is missing (fdo#59965) [Caolán McNamara]
+ crash fix (insecure clear screen during Logo execution) (fdo#59969) [László Németh]
+ do not call putenv with a temporary string argument [Stephan Bergmann]
+ don't delete the PropertyMapEntry instance prematurely. (bnc#798271) [Kohei Yoshida]
+ don't use ScDrawLayer::GetObjDataTab to get Anchor fix for (fdo#59325) [Noel Power]
+ ensure internal data is always used when pasting to another doc. (fdo#58562) [Kohei Yoshida]
+ fix encoding of .py files as UTF-8 for Python 3 (fdo#59728) [Stephan Bergmann]
+ fix SDK MSI version LOdev 4.1 SDK.0.0.alpha0 (fdo#59798) [Michael Stahl]
+ if loading a ll-TT trans succeeds, don't fallback to ll (fdo#59422) [Caolán McNamara]
+ import inherited number formats with cached values, (fdo#59724) [Markus Mohrhard]
+ lo-pack-sources: run NOCONFIGURE=1 ./autogen.sh instead of autoreconf [Petr Mladek]
+ missing comma in particular PDF file
[Libreoffice-commits] .: stoc/source udkapi/com
stoc/source/corereflection/crefl.cxx | 42 +++--
stoc/source/registry_tdprovider/tdprovider.cxx | 17 -
udkapi/com/sun/star/reflection/TypeDescriptionManager.idl | 16 +++-
udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl | 13 ++--
4 files changed, 59 insertions(+), 29 deletions(-)
New commits:
commit 2356a480fea6cac8cccaae85c9a2b6a312a9048c
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jan 30 17:46:38 2013 +0100
API CHANGE: Make TypeDescriptionManager/Provider more consistent
...by letting their getByHierarchicalName methods return information about
UNO constants as X(Constant)TypeDescription values, just as for (alomst --
see
the odd enum member case) all other entities. This will make future
changes in
this area easier.
The only affected client I could find so far is the core reflection
service, but
there might be more that I overlooked.
Change-Id: I6731f2914773d49e33eeaec6e256ff2e5409ad2d
diff --git a/stoc/source/corereflection/crefl.cxx
b/stoc/source/corereflection/crefl.cxx
index 3357a54..a51f58a 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -21,6 +21,7 @@
#include cppuhelper/implementationentry.hxx
#include com/sun/star/lang/XComponent.hpp
+#include com/sun/star/reflection/XConstantTypeDescription.hpp
#include com/sun/star/reflection/XTypeDescription.hpp
#include com/sun/star/uno/RuntimeException.hpp
@@ -283,35 +284,42 @@ Any IdlReflectionServiceImpl::getByHierarchicalName(
const OUString rName )
Any aRet( _aElements.getValue( rName ) );
if (! aRet.hasValue())
{
-// first look for constants exclusivly!
aRet = _xTDMgr-getByHierarchicalName( rName );
-if (aRet.getValueTypeClass() == TypeClass_INTERFACE) // if no constant,
- // i.e.
XTypeDescription for a type
+if (aRet.getValueTypeClass() == TypeClass_INTERFACE)
{
// type retrieved from tdmgr
OSL_ASSERT( (*(Reference XInterface
*)aRet.getValue())-queryInterface(
::getCppuType( (const Reference XTypeDescription *)0 )
).hasValue() );
-// if you are interested in a type then CALL forName()!!!
-// this way is NOT recommended for types, because this method
looks for constants first
+css::uno::Reference css::reflection::XConstantTypeDescription
+ctd;
+if (aRet = ctd)
+{
+aRet = ctd-getConstantValue();
+}
+else
+{
+// if you are interested in a type then CALL forName()!!!
+// this way is NOT recommended for types, because this method
looks for constants first
-// if td manager found some type, it will be in the cache
(hopefully.. we just got it)
-// so the second retrieving via c typelib callback chain should
succeed...
+// if td manager found some type, it will be in the cache
(hopefully.. we just got it)
+// so the second retrieving via c typelib callback chain
should succeed...
-// try to get _type_ by name
-typelib_TypeDescription * pTD = 0;
-typelib_typedescription_getByName( pTD, rName.pData );
+// try to get _type_ by name
+typelib_TypeDescription * pTD = 0;
+typelib_typedescription_getByName( pTD, rName.pData );
-aRet.clear(); // kick XTypeDescription interface
+aRet.clear(); // kick XTypeDescription interface
-if (pTD)
-{
-Reference XIdlClass xIdlClass( constructClass( pTD ) );
-aRet.setValue( xIdlClass, ::getCppuType( (const Reference
XIdlClass *)0 ) );
-typelib_typedescription_release( pTD );
+if (pTD)
+{
+Reference XIdlClass xIdlClass( constructClass( pTD ) );
+aRet.setValue( xIdlClass, ::getCppuType( (const
Reference XIdlClass *)0 ) );
+typelib_typedescription_release( pTD );
+}
}
}
-// else is constant
+// else is enum member(?)
// update
if (aRet.hasValue())
diff --git a/stoc/source/registry_tdprovider/tdprovider.cxx
b/stoc/source/registry_tdprovider/tdprovider.cxx
index 87089a9..92dbc92 100644
--- a/stoc/source/registry_tdprovider/tdprovider.cxx
+++ b/stoc/source/registry_tdprovider/tdprovider.cxx
@@ -365,9 +365,10 @@ Any ProviderImpl::getByHierarchicalNameImpl( const
OUString rName )
aBytes.getConstArray(), aBytes.getLength(),
false, TYPEREG_VERSION_1);
-if (aReader.getTypeClass() == RT_TYPE_MODULE ||
Change in core[libreoffice-4-0]: resolved fdo#60078 correctly calculate IMCSCH and IMSECH
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1926 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/1926/1 resolved fdo#60078 correctly calculate IMCSCH and IMSECH For the transformation used see http://de.wikipedia.org/wiki/Sekans_Hyperbolicus_und_Kosekans_Hyperbolicus#Komplexes_Argument (German only) Change-Id: If502b708069d7fcbe09e954b26ce8b7268b6 (cherry picked from commit b884c2e0185e24fc498827b3a53becea9e646b85) --- M scaddins/source/analysis/analysishelper.cxx 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 08a0967..8fddc7b 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -2075,8 +2075,8 @@ THROW_IAE; double fScale =1.0 / ( cosh( 2.0 * r ) + cos( 2.0 * i )); double r_; -r_ = 2.0 * cosh( 2.0 * r ) * cos( i ) * fScale; -i = - (2.0 * sinh( 2.0 * r ) * sin( i ) * fScale ); +r_ = 2.0 * cosh( r ) * cos( i ) * fScale; +i = - (2.0 * sinh( r ) * sin( i ) * fScale ); r = r_ ; } else @@ -2096,8 +2096,8 @@ THROW_IAE; double fScale =1.0 / ( cosh( 2.0 * r ) - cos( 2.0 * i )); double r_; -r_ = 2.0 * sinh( 2.0 * r ) * cos( i ) * fScale; -i = - ( 2.0 * cosh( 2.0 * r ) * sin( i ) * fScale ); +r_ = 2.0 * sinh( r ) * cos( i ) * fScale; +i = - ( 2.0 * cosh( r ) * sin( i ) * fScale ); r = r_ ; } else -- To view, visit https://gerrit.libreoffice.org/1926 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If502b708069d7fcbe09e954b26ce8b7268b6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-3-6]: resolved fdo#60078 correctly calculate IMCSCH and IMSECH
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1927 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/1927/1 resolved fdo#60078 correctly calculate IMCSCH and IMSECH For the transformation used see http://de.wikipedia.org/wiki/Sekans_Hyperbolicus_und_Kosekans_Hyperbolicus#Komplexes_Argument (German only) Change-Id: If502b708069d7fcbe09e954b26ce8b7268b6 (cherry picked from commit b884c2e0185e24fc498827b3a53becea9e646b85) --- M scaddins/source/analysis/analysishelper.cxx 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx index 2347f53..1e720db 100644 --- a/scaddins/source/analysis/analysishelper.cxx +++ b/scaddins/source/analysis/analysishelper.cxx @@ -2085,8 +2085,8 @@ THROW_IAE; double fScale =1.0 / ( cosh( 2.0 * r ) + cos( 2.0 * i )); double r_; -r_ = 2.0 * cosh( 2.0 * r ) * cos( i ) * fScale; -i = - (2.0 * sinh( 2.0 * r ) * sin( i ) * fScale ); +r_ = 2.0 * cosh( r ) * cos( i ) * fScale; +i = - (2.0 * sinh( r ) * sin( i ) * fScale ); r = r_ ; } else @@ -2106,8 +2106,8 @@ THROW_IAE; double fScale =1.0 / ( cosh( 2.0 * r ) - cos( 2.0 * i )); double r_; -r_ = 2.0 * sinh( 2.0 * r ) * cos( i ) * fScale; -i = - ( 2.0 * cosh( 2.0 * r ) * sin( i ) * fScale ); +r_ = 2.0 * sinh( r ) * cos( i ) * fScale; +i = - ( 2.0 * cosh( r ) * sin( i ) * fScale ); r = r_ ; } else -- To view, visit https://gerrit.libreoffice.org/1927 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If502b708069d7fcbe09e954b26ce8b7268b6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: pyuno/source
pyuno/source/module/pyuno_module.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit bd2c4e8dc42c04eb05adfa32a0d5ce9c72bcfd5d
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jan 30 18:13:26 2013 +0100
Adapt PyUNO getConstantByName to previous TypeDescriptionMgr API CHANGE
Change-Id: I5a91c6c6dce103a8e4daa1572a638e1968a48fd8
diff --git a/pyuno/source/module/pyuno_module.cxx
b/pyuno/source/module/pyuno_module.cxx
index bd73c0b..1638aba 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.cxx
@@ -37,6 +37,7 @@
#include uno/current_context.hxx
#include cppuhelper/bootstrap.hxx
+#include com/sun/star/reflection/XConstantTypeDescription.hpp
#include com/sun/star/reflection/XIdlReflection.hpp
#include com/sun/star/reflection/XIdlClass.hpp
#include com/sun/star/registry/InvalidRegistryException.hpp
@@ -477,18 +478,17 @@ static PyObject *getConstantByName(
{
OUString typeName ( OUString::createFromAscii( name ) );
Runtime runtime;
-Any a =
runtime.getImpl()-cargo-xTdMgr-getByHierarchicalName(typeName);
-if( a.getValueType().getTypeClass() ==
-com::sun::star::uno::TypeClass_INTERFACE )
+css::uno::Reference css::reflection::XConstantTypeDescription
td;
+if (!(runtime.getImpl()-cargo-xTdMgr-getByHierarchicalName(
+ typeName)
+ = td))
{
-// a idl constant cannot be an instance of an uno-object, thus
-// this cannot be a constant
OUStringBuffer buf;
buf.appendAscii( pyuno.getConstantByName: ).append(
typeName );
buf.appendAscii( is not a constant );
throw RuntimeException(buf.makeStringAndClear(), Reference
XInterface () );
}
-PyRef constant = runtime.any2PyObject( a );
+PyRef constant = runtime.any2PyObject( td-getConstantValue() );
ret = constant.getAcquired();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-qa] FDO BSA Administration Info - New version 4.0.0.3 rc
Version 4.0.0.3 rc has been added to FreeDesktop.Org and will be added shortly to BSA. Best Regards, Joel -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Need comfirmation about no function of Modeless Dialogs in 4.0
On 01/28/2013 03:39 PM, Fernand Vanrie wrote: We uses the Basic codelines below to make Modeless Dialogs, sinds 4.0 we endup with a non-visible window is this Windows only or a more general regression ?, it was working until 3.6.4 windows? Trying out that Basic code with my local master build on Linux (Fedora 18), it leads to approximately the same result as when trying it out with Fedora's LO 3.6.3 -- it shows an empty window (though the master build appears to no longer honor the position and size arguments, but instead uses some default values of its own). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sc/qa sc/source
sc/qa/unit/data/ods/miscemptyrepeatedrowheights.ods |binary
sc/qa/unit/data/xlsx/miscrowheights.xlsx|binary
sc/qa/unit/subsequent_export-test.cxx | 74 ++
sc/source/filter/excel/xetable.cxx | 81 ++--
sc/source/filter/inc/xetable.hxx|4
5 files changed, 138 insertions(+), 21 deletions(-)
New commits:
commit b75bf09a5b905a3ed9c251869983a400c70c7fc6
Author: Noel Power noel.po...@suse.com
Date: Tue Jan 29 14:51:49 2013 +
correctly handle repeated row heights for empty rows ( fdo#59973 )
it seems both xls xlsx export suffer from problems with multiple row
heights
repeated ( if those rows are empty )
Change-Id: I3ed68a81517a3e55d1de1954fcb99e7cb39be337
diff --git a/sc/qa/unit/data/ods/miscemptyrepeatedrowheights.ods
b/sc/qa/unit/data/ods/miscemptyrepeatedrowheights.ods
new file mode 100644
index 000..5511ad9
Binary files /dev/null and
b/sc/qa/unit/data/ods/miscemptyrepeatedrowheights.ods differ
diff --git a/sc/qa/unit/data/xlsx/miscrowheights.xlsx
b/sc/qa/unit/data/xlsx/miscrowheights.xlsx
new file mode 100755
index 000..dbdbc13
Binary files /dev/null and b/sc/qa/unit/data/xlsx/miscrowheights.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 7b0fde8..05c4873 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -77,6 +77,7 @@ public:
void test();
void testPasswordExport();
void testConditionalFormatExportXLSX();
+void testMiscRowHeightExport();
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
@@ -84,6 +85,7 @@ public:
CPPUNIT_TEST(testPasswordExport);
#endif
CPPUNIT_TEST(testConditionalFormatExportXLSX);
+CPPUNIT_TEST(testMiscRowHeightExport);
CPPUNIT_TEST_SUITE_END();
private:
@@ -297,6 +299,78 @@ void ScExportTest::testConditionalFormatExportXLSX()
testCondFile(aCSVPath, pDoc, 0);
}
+void ScExportTest::testMiscRowHeightExport()
+{
+
+struct TestParam
+{
+struct RowData
+{
+SCROW nStartRow;
+SCROW nEndRow;
+SCTAB nTab;
+int nExpectedHeight;
+};
+const char* sTestDoc;
+int nImportType;
+int nExportType;
+int nRowData;
+RowData* pData;
+};
+
+TestParam::RowData DfltRowData[] =
+{
+{ 0, 4, 0, 529 },
+{ 5, 10, 0, 1058 },
+{ 17, 20, 0, 1767 },
+{ 1048573, 1048575, 0, 529 },
+};
+
+TestParam::RowData EmptyRepeatRowData[] =
+{
+{ 0, 4, 0, 529 },
+{ 5, 10, 0, 1058 },
+{ 17, 20, 0, 1767 },
+};
+
+TestParam aTestValues[] =
+{
+{ miscrowheights., XLSX, XLSX, SAL_N_ELEMENTS(DfltRowData),
DfltRowData },
+{ miscrowheights., XLSX, XLS, SAL_N_ELEMENTS(DfltRowData),
DfltRowData },
+{ miscemptyrepeatedrowheights., ODS, XLSX,
SAL_N_ELEMENTS(EmptyRepeatRowData), EmptyRepeatRowData },
+{ miscemptyrepeatedrowheights., ODS, XLS,
SAL_N_ELEMENTS(EmptyRepeatRowData), EmptyRepeatRowData },
+};
+
+for ( unsigned int index=0; indexSAL_N_ELEMENTS(aTestValues); ++index )
+{
+OUString sFileName = OUString::createFromAscii( aTestValues[ index
].sTestDoc );
+printf(aTestValues[%d] %s\n, index, OUStringToOString( sFileName,
RTL_TEXTENCODING_UTF8 ).getStr() );
+int nImportType = aTestValues[ index ].nImportType;
+int nExportType = aTestValues[ index ].nExportType;
+ScDocShellRef xShell = loadDocument( sFileName, nImportType );
+CPPUNIT_ASSERT(xShell.Is());
+
+ScDocShellRef xDocSh = saveAndReload((*xShell), nExportType );
+CPPUNIT_ASSERT(xDocSh.Is());
+
+ScDocument* pDoc = xDocSh-GetDocument();
+
+for (int i=0; iaTestValues[ index ].nRowData; ++i)
+{
+SCROW nRow = aTestValues[ index ].pData[ i].nStartRow;
+SCROW nEndRow = aTestValues[ index ].pData[ i ].nEndRow;
+SCTAB nTab = aTestValues[ index ].pData[ i ].nTab;
+int nExpectedHeight = aTestValues[ index ].pData[ i
].nExpectedHeight;
+for ( ; nRow = nEndRow; ++nRow )
+{
+printf(\t checking row %d for height %d\n, nRow,
nExpectedHeight );
+int nHeight = sc::TwipsToHMM( pDoc-GetRowHeight(nRow, nTab,
false) );
+CPPUNIT_ASSERT_EQUAL(nExpectedHeight, nHeight);
+}
+}
+}
+}
+
ScExportTest::ScExportTest()
: m_aBaseString(RTL_CONSTASCII_USTRINGPARAM(/sc/qa/unit/data))
{
diff --git a/sc/source/filter/excel/xetable.cxx
b/sc/source/filter/excel/xetable.cxx
index 178acd9..c44b32c 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -1709,6 +1709,7 @@ XclExpRow::XclExpRow( const XclExpRoot rRoot, sal_uInt32
nXclRow,
mnXFIndex( EXC_XF_DEFAULTCELL
Change in core[master]: Introduce SAL_OVERRIDE
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1928
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/1928/1
Introduce SAL_OVERRIDE
Change-Id: I3675b627d5e9ca19b2c4fb69fef12d0dabf94a43
---
M config/config_global.h.in
M configure.ac
M oox/inc/oox/vml/vmlshape.hxx
M sal/inc/sal/types.h
4 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/config/config_global.h.in b/config/config_global.h.in
index 7080a69..0f85b59 100644
--- a/config/config_global.h.in
+++ b/config/config_global.h.in
@@ -13,6 +13,7 @@
#define CONFIG_GLOBAL_H
#undef HAVE_CXX11_DELETE
+#undef HAVE_CXX11_OVERRIDE
#undef HAVE_GCC_BUILTIN_ATOMIC
#undef HAVE_SFINAE_ANONYMOUS_BROKEN
#undef HAVE_THREADSAFE_STATICS
diff --git a/configure.ac b/configure.ac
index eb0a434..10897a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5642,6 +5642,39 @@
AC_MSG_RESULT([no (C++11 disabled)])
fi
+dnl ==
+dnl Check for C++11 override support
+dnl ==
+
+AC_MSG_CHECKING([whether $CXX supports C++11 override syntax])
+if test $HAVE_CXX0X = TRUE; then
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS=$CXXFLAGS $CXXFLAGS_CXX11
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+struct A
+{
+virtual void test();
+};
+
+struct B : A
+{
+virtual void test() override;
+};
+]])],[HAVE_CXX11_OVERRIDE=TRUE],[])
+
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+if test $HAVE_CXX11_OVERRIDE = TRUE; then
+AC_MSG_RESULT([yes])
+AC_DEFINE([HAVE_CXX11_OVERRIDE])
+else
+AC_MSG_RESULT([no])
+fi
+else
+AC_MSG_RESULT([no (C++11 disabled)])
+fi
+
dnl ===
dnl system stl sanity tests
dnl ===
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 8373d4f..f1a9652 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -340,9 +340,9 @@
protected:
/** Returns the absolute shape rectangle. */
-virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const;
+virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const
SAL_OVERRIDE;
/** Returns the rectangle relative to the parent coordinate system. */
-virtual ::com::sun::star::awt::Rectangle getRelRectangle() const;
+virtual ::com::sun::star::awt::Rectangle getRelRectangle() const
SAL_OVERRIDE;
};
/** Bezier shape object that supports to, from, control1 and control2
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 8ada6d7..117de03 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -416,6 +416,19 @@
#define SAL_DELETED_FUNCTION
#endif
+/** C++11 override feature.
+
+With HAVE_CXX11_OVERRIDE, force the method to override a existing method in
+parent, error out if the method with the correct signature does not exist.
+
+@since LibreOffice 4.1
+*/
+#if defined HAVE_CXX11_OVERRIDE
+#define SAL_OVERRIDE override
+#else
+#define SAL_OVERRIDE
+#endif
+
#endif /* __cplusplus */
#ifdef __cplusplus
--
To view, visit https://gerrit.libreoffice.org/1928
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3675b627d5e9ca19b2c4fb69fef12d0dabf94a43
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Miklos Vajna vmik...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 7 commits - sc/inc sc/source
sc/inc/attarray.hxx | 10 ++
sc/inc/dociter.hxx |2 +-
sc/source/core/data/attarray.cxx | 39 +--
sc/source/core/data/dociter.cxx | 24 +++-
4 files changed, 35 insertions(+), 40 deletions(-)
New commits:
commit cd13c045846bb2af4eefc46dc8f020f6073b6054
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Jan 30 05:36:02 2013 +0100
unfriend this class and the method
Change-Id: I43645409bee380ef6664109c4480ca37c5f3ecd2
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index c56207a..66db88a 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -87,9 +87,6 @@ friend class ScDocument;// for FillInfo
friend class ScDocumentIterator;
friend class ScAttrIterator;
friend class ScHorizontalAttrIterator;
-friend void ScAttrArray_IterGetNumberFormat( sal_uLong nFormat,
-const ScAttrArray* rpArr, SCROW nAttrEndRow,
-const ScAttrArray* pNewArr, SCROW nRow, ScDocument* pDoc );
boolApplyFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem*
pLineInner,
SCROW nStartRow, SCROW nEndRow,
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index cfcc52a..9d6098d 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -222,12 +222,18 @@ void ScAttrArray_IterGetNumberFormat( sal_uLong nFormat,
const ScAttrArray* rp
{
if ( rpArr != pNewArr || nAttrEndRow nRow )
{
-SCSIZE nPos;
-pNewArr-Search( nRow, nPos ); // nPos 0 gueltig wenn nicht gefunden
-const ScPatternAttr* pPattern = pNewArr-pData[nPos].pPattern;
+SCROW nRowStart = 0;
+SCROW nRowEnd = MAXROW;
+const ScPatternAttr* pPattern;
+if( !(pPattern = pNewArr-GetPatternRange( nRowStart, nRowEnd, nRow )
) )
+{
+pPattern = pDoc-GetDefPattern();
+nRowEnd = MAXROW;
+}
+
nFormat = pPattern-GetNumberFormat( pDoc-GetFormatTable() );
rpArr = pNewArr;
-nAttrEndRow = pNewArr-pData[nPos].nRow;
+nAttrEndRow = nRowEnd;
}
}
commit 41281d37530051203c69ddda5995463a3c88
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Jan 30 05:05:31 2013 +0100
make a few more users of ScAttrArray outside of the class const
Change-Id: I76aca6b1ddb8a326eecf70a68bed2a754e462c49
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 7244921..3683111 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -141,7 +141,7 @@ public:
private:
static SCROWGetRowByColEntryIndex(ScDocument rDoc, SCTAB nTab,
SCCOL nCol, SCSIZE nColRow);
static ScBaseCell* GetCellByColEntryIndex(ScDocument rDoc, SCTAB nTab,
SCCOL nCol, SCSIZE nColRow);
-static ScAttrArray* GetAttrArrayByCol(ScDocument rDoc, SCTAB nTab, SCCOL
nCol);
+static const ScAttrArray* GetAttrArrayByCol(ScDocument rDoc, SCTAB nTab,
SCCOL nCol);
static bool IsQueryValid(ScDocument rDoc, const ScQueryParam
rParam, SCTAB nTab, SCROW nRow, ScBaseCell* pCell);
static SCSIZE SearchColEntryIndex(ScDocument rDoc, SCTAB nTab,
SCROW nRow, SCCOL nCol);
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index e343680..cfcc52a 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -98,7 +98,7 @@ bool ScDocumentIterator::GetThisCol()
return false;
}
ScColumn* pCol = pTab-aCol[nCol];
-ScAttrArray*pAtt = pCol-pAttrArray;
+const ScAttrArray* pAtt = pCol-pAttrArray;
bool bFound = false;
do
@@ -477,7 +477,7 @@ ScBaseCell*
ScDBQueryDataIterator::GetCellByColEntryIndex(ScDocument rDoc, SCTA
return pCol-maItems[nColRow].pCell;
}
-ScAttrArray* ScDBQueryDataIterator::GetAttrArrayByCol(ScDocument rDoc, SCTAB
nTab, SCCOL nCol)
+const ScAttrArray* ScDBQueryDataIterator::GetAttrArrayByCol(ScDocument rDoc,
SCTAB nTab, SCCOL nCol)
{
if (nTab = rDoc.GetTableCount())
OSL_FAIL(try to access index out of bounds, FIX IT);
@@ -1938,7 +1938,7 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator(
ScDocument* pDocument, SCTAB
for (i=nStartCol; i=nEndCol; i++)
{
SCCOL nPos = i - nStartCol;
-ScAttrArray* pArray = pDoc-maTabs[nTab]-aCol[i].pAttrArray;
+const ScAttrArray* pArray = pDoc-maTabs[nTab]-aCol[i].pAttrArray;
OSL_ENSURE( pArray, pArray == 0 );
SCSIZE nIndex;
@@ -1967,7 +1967,7 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator(
ScDocument* pDocument, SCTAB
ScHorizontalAttrIterator::~ScHorizontalAttrIterator()
{
-delete[] (ScPatternAttr**)ppPatterns;
+delete[] ppPatterns;
delete[] pNextEnd;
delete[] pIndices;
}
@@ -2012,7 +2012,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext(
SCCOL rCol1, SCCOL rCo
SCCOL nPos = i-nStartCol;
[Libreoffice-commits] .: chart2/source
chart2/source/tools/StatisticsHelper.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit b0cc48440dc410d283525c0577a1175476b447a9
Author: Michael Stahl mst...@redhat.com
Date: Wed Jan 30 19:47:51 2013 +0100
chart2: try to make MSVC happy with OUString
Change-Id: I4c5a9572e897aa12aad3a8eb5797e4bca2f036cf
diff --git a/chart2/source/tools/StatisticsHelper.cxx
b/chart2/source/tools/StatisticsHelper.cxx
index a955a97..81f47e0 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -308,7 +308,8 @@ Reference beans::XPropertySet
StatisticsHelper::addErrorBars(
if( !xSeriesProp.is())
return xErrorBar;
-const OUString aPropName( bYError ? ErrorBarY : ErrorBarX);
+const OUString aPropName(
+(bYError) ? OUString(ErrorBarY) : OUString(ErrorBarX));
if( !( xSeriesProp-getPropertyValue( aPropName ) = xErrorBar ) ||
!xErrorBar.is())
{
@@ -332,7 +333,8 @@ Reference beans::XPropertySet
StatisticsHelper::getErrorBars(
{
Reference beans::XPropertySet xSeriesProp( xDataSeries, uno::UNO_QUERY
);
Reference beans::XPropertySet xErrorBar;
-const OUString aPropName( bYError ? ErrorBarY : ErrorBarX);
+const OUString aPropName(
+(bYError) ? OUString(ErrorBarY) : OUString(ErrorBarX));
if ( xSeriesProp.is())
xSeriesProp-getPropertyValue( aPropName ) = xErrorBar;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
calling order of sw/source/filter/ww8/attributeoutputbase callbacks
Hello. In class sw/source/filter/ww8/docxattributeoutput.hxx or its parent sw/source/filter/ww8/attributeoutputbase.hxx, the possible orders in which the EndURL, RunText, EndRun (and probably StartURL) callbacks may be executed when exporting an hyperlink is not explicit. This has already caused at least four bugs: 47669, 52610, 53175 and 55820. Docs.libreoffice.org only confirms what the names suggest: * StartURL() and EndURL() are called in this order by SwWW8AttrIter::OutAttrWithRange() and MSWord_SdrAttrIter::OutEEField() * RunText() and EndRun() are called in this order by MSWordExportBase::OutputTextNode. Could someone tell me what can be asserted about the calling order, or give me a link to some documentation? (I am not subscribed to this list) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: calling order of sw/source/filter/ww8/attributeoutputbase callbacks
Bonjour Nicolas, On Wed, 2013-01-30 at 19:56 +0100, Nicolas Boulenguez wrote: In class sw/source/filter/ww8/docxattributeoutput.hxx or its parent sw/source/filter/ww8/attributeoutputbase.hxx, the possible orders in which the EndURL, RunText, EndRun (and probably StartURL) callbacks may be executed when exporting an hyperlink is not explicit. This has already caused at least four bugs: 47669, 52610, 53175 and 55820. It seems pretty tricky to get all these bugs properly fixed. Docs.libreoffice.org only confirms what the names suggest: * StartURL() and EndURL() are called in this order by SwWW8AttrIter::OutAttrWithRange() and MSWord_SdrAttrIter::OutEEField() * RunText() and EndRun() are called in this order by MSWordExportBase::OutputTextNode. Could someone tell me what can be asserted about the calling order, or give me a link to some documentation? The only documentation to help you are the doc / RTF and OOXML specifications (available on the MSDN library). (I am not subscribed to this list) There is no need to subscribe :) -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst |8
solenv/inc/minor.mk |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 9c526e4e643811ae30d4257a74de2f5f16ffd391
Author: Andras Timar ati...@suse.com
Date: Wed Jan 30 16:39:26 2013 +0100
Bump for 3.6-9
Change-Id: Icdf721280feefd4dd5cd78e09ab8cba74245e54c
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 745a4c6..3dbc2d7 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,7 +32,7 @@ Globals
CREATE_MSP_INSTALLSET 1
UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 8
+WINDOWSPATCHLEVEL 9
OOOVENDOR The Document Foundation
OOODOWNLOADNAME 1
BUILDIDCWS {buildidcws}
@@ -57,7 +57,7 @@ LibreOffice
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-308
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-309
BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-308
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-309
BASEPRODUCTVERSION 3.6
DEVELOPMENTPRODUCT 1
BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
BRANDPACKAGEVERSION 3.6
USERDIRPRODUCTVERSION 3
ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-308
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-309
BASEPRODUCTVERSION 3.6
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 0d6a437..89edba1 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
RSCVERSION=360
-RSCREVISION=360m1(Build:308)
-BUILD=308
+RSCREVISION=360m1(Build:309)
+BUILD=309
LAST_MINOR=m1
SOURCEVERSION=OOO360
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.ac
configure.ac |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 5f27719e4e501506b82bf095aa1b2b1aac5eb390 Author: Miklos Vajna vmik...@suse.cz Date: Wed Jan 30 21:04:28 2013 +0100 configure: better libstdc++ ABI breakage check The old code expected that gcc -dumpversion outputs x.y.z, but just x.y is also a valid output. Use the preprocessor defines instead, this way SUSE 4.7.2 gcc will use -std=gnu++0x as well. Change-Id: I9871b05953ab255c66dd152c0befd29037522902 diff --git a/configure.ac b/configure.ac index eb0a434..e49cc38 100644 --- a/configure.ac +++ b/configure.ac @@ -5558,10 +5558,17 @@ if test $GCC = yes; then AC_MSG_RESULT([no]) fi +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#if __GNUC__ == 4 __GNUC_MINOR__ == 7 (__GNUC_PATCHLEVEL__ == 0 || __GNUC_PATCHLEVEL__ == 1) +#else +abi ok +#endif +]])],[HAVE_BROKEN_ABI=TRUE],[HAVE_BROKEN_ABI=FALSE]) + AC_MSG_CHECKING([whether $CXX supports C++11 without Language Defect 757]) # This should check libstdc++ version, not gcc, but clang has incidentally C++11 support # disabled in this case by the __float128 case below. -if test $GCCVER -ge 040700 -a $GCCVER -lt 040702; then +if test $HAVE_BROKEN_ABI = TRUE; then AC_MSG_NOTICE([Not using -std=gnu++0x on $CXX version 4.7.0/4.7.1 due to libstdc++ ABI breakage.]) else save_CXXFLAGS=$CXXFLAGS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 59270, which changed state. Bug 59270 Summary: TEMPLATE related: Page margin changes unexpectedly on page two https://bugs.freedesktop.org/show_bug.cgi?id=59270 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- 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] .: sc/qa
sc/qa/unit/subsequent_export-test.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 086b070e31f607ffc4b057eef54669b95d774279
Author: Tor Lillqvist t...@iki.fi
Date: Wed Jan 30 22:31:42 2013 +0200
WaE: format %d expects argument of type int, but argument 2 has type long
int
Change-Id: I0fe32f14641ed2c2cf1ee4e0f03aa9bef805ef1d
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 05c4873..5829f43 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -363,7 +363,7 @@ void ScExportTest::testMiscRowHeightExport()
int nExpectedHeight = aTestValues[ index ].pData[ i
].nExpectedHeight;
for ( ; nRow = nEndRow; ++nRow )
{
-printf(\t checking row %d for height %d\n, nRow,
nExpectedHeight );
+printf(\t checking row %ld for height %d\n, nRow,
nExpectedHeight );
int nHeight = sc::TwipsToHMM( pDoc-GetRowHeight(nRow, nTab,
false) );
CPPUNIT_ASSERT_EQUAL(nExpectedHeight, nHeight);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config/config_global.h.in configure.ac oox/inc sal/inc
config/config_global.h.in|1 +
configure.ac | 33 +
oox/inc/oox/vml/vmlshape.hxx |4 ++--
sal/inc/sal/types.h | 13 +
4 files changed, 49 insertions(+), 2 deletions(-)
New commits:
commit 3891d323cdc3c03154f5682baaeaa4b2ef015a63
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Jan 30 18:38:13 2013 +0100
Introduce SAL_OVERRIDE
Change-Id: I3675b627d5e9ca19b2c4fb69fef12d0dabf94a43
diff --git a/config/config_global.h.in b/config/config_global.h.in
index 7080a69..0f85b59 100644
--- a/config/config_global.h.in
+++ b/config/config_global.h.in
@@ -13,6 +13,7 @@ Any change in this header will cause a rebuild of almost
everything.
#define CONFIG_GLOBAL_H
#undef HAVE_CXX11_DELETE
+#undef HAVE_CXX11_OVERRIDE
#undef HAVE_GCC_BUILTIN_ATOMIC
#undef HAVE_SFINAE_ANONYMOUS_BROKEN
#undef HAVE_THREADSAFE_STATICS
diff --git a/configure.ac b/configure.ac
index e49cc38..a707d4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5649,6 +5649,39 @@ else
AC_MSG_RESULT([no (C++11 disabled)])
fi
+dnl ==
+dnl Check for C++11 override support
+dnl ==
+
+AC_MSG_CHECKING([whether $CXX supports C++11 override syntax])
+if test $HAVE_CXX0X = TRUE; then
+save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS=$CXXFLAGS $CXXFLAGS_CXX11
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+struct A
+{
+virtual void test();
+};
+
+struct B : A
+{
+virtual void test() override;
+};
+]])],[HAVE_CXX11_OVERRIDE=TRUE],[])
+
+AC_LANG_POP([C++])
+CXXFLAGS=$save_CXXFLAGS
+if test $HAVE_CXX11_OVERRIDE = TRUE; then
+AC_MSG_RESULT([yes])
+AC_DEFINE([HAVE_CXX11_OVERRIDE])
+else
+AC_MSG_RESULT([no])
+fi
+else
+AC_MSG_RESULT([no (C++11 disabled)])
+fi
+
dnl ===
dnl system stl sanity tests
dnl ===
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index 8373d4f..f1a9652 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -340,9 +340,9 @@ public:
protected:
/** Returns the absolute shape rectangle. */
-virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const;
+virtual ::com::sun::star::awt::Rectangle getAbsRectangle() const
SAL_OVERRIDE;
/** Returns the rectangle relative to the parent coordinate system. */
-virtual ::com::sun::star::awt::Rectangle getRelRectangle() const;
+virtual ::com::sun::star::awt::Rectangle getRelRectangle() const
SAL_OVERRIDE;
};
/** Bezier shape object that supports to, from, control1 and control2
diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h
index 8ada6d7..117de03 100644
--- a/sal/inc/sal/types.h
+++ b/sal/inc/sal/types.h
@@ -416,6 +416,19 @@ namespace css = ::com::sun::star;
#define SAL_DELETED_FUNCTION
#endif
+/** C++11 override feature.
+
+With HAVE_CXX11_OVERRIDE, force the method to override a existing method in
+parent, error out if the method with the correct signature does not exist.
+
+@since LibreOffice 4.1
+*/
+#if defined HAVE_CXX11_OVERRIDE
+#define SAL_OVERRIDE override
+#else
+#define SAL_OVERRIDE
+#endif
+
#endif /* __cplusplus */
#ifdef __cplusplus
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: formula/source
formula/source/core/api/FormulaCompiler.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 63e3d8671ef5cf9405405c8f3c388b0aea679e91 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Wed Jan 30 22:02:06 2013 +0100 make it possible to update DDE links after loading, fdo#59032 Change-Id: Iba49bec62cb9081cdcd9410215f269b59c1be304 diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index c402113..8323e15 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -1076,6 +1076,9 @@ void FormulaCompiler::Factor() pArr-SetRecalcModeOnLoad(); pArr-SetHyperLink(true); break; +case ocDde: +pArr-SetRecalcModeOnLoad(); +break; default: ; // nothing } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/filter/excel/xeformula.cxx | 46 +++-
sc/source/filter/oox/formulabase.cxx | 66 ++-
2 files changed, 71 insertions(+), 41 deletions(-)
New commits:
commit 0c7a1b6e10011930b703897073b8d41e94f7d827
Author: Eike Rathke er...@redhat.com
Date: Wed Jan 30 22:28:48 2013 +0100
resolved fdo#60087 corrected .xlsx export of functions
Change-Id: I6c7ba47dde88a73d035b1db5f7f4cede78b262db
diff --git a/sc/source/filter/excel/xeformula.cxx
b/sc/source/filter/excel/xeformula.cxx
index 603ee9d..893321b 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1406,20 +1406,24 @@ void XclExpFmlaCompImpl::ProcessFunction( const
XclExpScToken rTokData )
void XclExpFmlaCompImpl::PrepareFunction( XclExpFuncData rFuncData )
{
-switch( rFuncData.GetOpCode() )
+// For OOXML these are not rewritten anymore.
+if (GetOutput() != EXC_OUTPUT_XML_2007)
{
-case ocCosecant:// simulate CSC(x) by (1/SIN(x))
-case ocSecant: // simulate SEC(x) by (1/COS(x))
-case ocCot: // simulate COT(x) by (1/TAN(x))
-case ocCosecantHyp: // simulate CSCH(x) by (1/SINH(x))
-case ocSecantHyp: // simulate SECH(x) by (1/COSH(x))
-case ocCotHyp: // simulate COTH(x) by (1/TANH(x))
-AppendIntToken( 1 );
-break;
-case ocArcCot: // simulate ACOT(x) by (PI/2-ATAN(x))
-AppendNumToken( F_PI2 );
-break;
-default:;
+switch( rFuncData.GetOpCode() )
+{
+case ocCosecant:// simulate CSC(x) by (1/SIN(x))
+case ocSecant: // simulate SEC(x) by (1/COS(x))
+case ocCot: // simulate COT(x) by (1/TAN(x))
+case ocCosecantHyp: // simulate CSCH(x) by (1/SINH(x))
+case ocSecantHyp: // simulate SECH(x) by (1/COSH(x))
+case ocCotHyp: // simulate COTH(x) by (1/TANH(x))
+AppendIntToken( 1 );
+break;
+case ocArcCot: // simulate ACOT(x) by
(PI/2-ATAN(x))
+AppendNumToken( F_PI2 );
+break;
+default:;
+}
}
}
@@ -1468,12 +1472,20 @@ void XclExpFmlaCompImpl::FinishFunction(
XclExpFuncData rFuncData, sal_uInt8 nC
case ocCosecantHyp: // simulate CSCH(x) by (1/SINH(x))
case ocSecantHyp: // simulate SECH(x) by (1/COSH(x))
case ocCotHyp: // simulate COTH(x) by (1/TANH(x))
-AppendBinaryOperatorToken( EXC_TOKID_DIV, true );
-AppendParenToken();
+// For OOXML not rewritten anymore.
+if (GetOutput() != EXC_OUTPUT_XML_2007)
+{
+AppendBinaryOperatorToken( EXC_TOKID_DIV, true );
+AppendParenToken();
+}
break;
case ocArcCot: // simulate ACOT(x) by
(PI/2-ATAN(x))
-AppendBinaryOperatorToken( EXC_TOKID_SUB, true );
-AppendParenToken();
+// For OOXML not rewritten anymore.
+if (GetOutput() != EXC_OUTPUT_XML_2007)
+{
+AppendBinaryOperatorToken( EXC_TOKID_SUB, true );
+AppendParenToken();
+}
break;
default:;
diff --git a/sc/source/filter/oox/formulabase.cxx
b/sc/source/filter/oox/formulabase.cxx
index 8aff106..a98e58a 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -216,6 +216,8 @@ const sal_uInt16 FUNCFLAG_MACROCALL_FN = 0x0400; /**
Function is stored a
const sal_uInt16 FUNCFLAG_MACROCALL_NEW = FUNCFLAG_MACROCALL |
FUNCFLAG_MACROCALL_FN; /** New Excel functions not
defined in OOXML,
_xlfn. prefix in all formats. OOXML name
must exist. */
+const sal_uInt16 FUNCFLAG_BIFFIMPORTONLY= 0x0800; /// Only used in BIFF
binary import filter.
+const sal_uInt16 FUNCFLAG_BIFFEXPORTONLY= 0x1000; /// Only used in BIFF
binary export filter.
/// Converts a function library index (value of enum FunctionLibraryType) to
function flags.
#define FUNCLIB_TO_FUNCFLAGS( funclib_index ) static_cast sal_uInt16 (
static_cast sal_uInt8 ( funclib_index ) 12 )
@@ -236,14 +238,21 @@ struct FunctionData
FunctionParamInfo mpParamInfos[ FUNCINFO_PARAMINFOCOUNT ]; ///
Information about all parameters.
sal_uInt16 mnFlags;/// Additional flags.
-inline bool isSupported( bool bImportFilter ) const;
+inline bool
Change in core[master]: Introduce SAL_OVERRIDE
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1928 -- To view, visit https://gerrit.libreoffice.org/1928 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3675b627d5e9ca19b2c4fb69fef12d0dabf94a43 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/filter/oox/formulabase.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit f3f092903bfaae0ee27ec56f7a004476e35460e1
Author: Eike Rathke er...@redhat.com
Date: Wed Jan 30 00:55:19 2013 +0100
resolved fdo#60043 write correct IM* function names
Prefixed with _xlfn. instead of programmatic Add-In name.
Change-Id: I4f119f92096329432488503f36df670a4ce19b42
(cherry picked from commit d701e808782f5849f22c112311a9553f08c8d553)
Reviewed-on: https://gerrit.libreoffice.org/1920
Reviewed-by: Kohei Yoshida kohei.yosh...@gmail.com
Tested-by: Kohei Yoshida kohei.yosh...@gmail.com
diff --git a/sc/source/filter/oox/formulabase.cxx
b/sc/source/filter/oox/formulabase.cxx
index ebbad45..929e6b0 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -729,6 +729,14 @@ static const FunctionData saFuncTableOox[] =
static const FunctionData saFuncTable2013[] =
{
{ IFNA, IFNA, NOID, NOID, 2, 2,
V, { VO, RO }, FUNCFLAG_MACROCALL_NEW },
+{ IMCOSH, IMCOSH, NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+{ IMCOT, IMCOT,NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+{ IMCSC, IMCSC,NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+{ IMCSCH, IMCSCH, NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+{ IMSEC, IMSEC,NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+{ IMSECH, IMSECH, NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+{ IMSINH, IMSINH, NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+{ IMTAN, IMTAN,NOID, NOID, 1, 1,
V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
};
/** Functions defined by OpenFormula, but not supported by Calc or by Excel. */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 7 commits - sw/uiconfig
sw/uiconfig/swriter/ui/titlepage.ui | 166 ++-- 1 file changed, 103 insertions(+), 63 deletions(-) New commits: commit 5679597c8a60578b928174f78fcfb6de38c80de8 Author: Caolán McNamara caol...@redhat.com Date: Wed Jan 30 23:17:11 2013 + HIG: align the edit button with the last spinner element Change-Id: Ia12af43223334156ffe8c9a0e9660e296fd4d68e diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui index 958eb25..d5509f2 100644 --- a/sw/uiconfig/swriter/ui/titlepage.ui +++ b/sw/uiconfig/swriter/ui/titlepage.ui @@ -537,4 +537,14 @@ action-widget response=0PB_HELP/action-widget /action-widgets /object + object class=GtkSizeGroup id=sizegroup1 +property name=ignore_hiddenTrue/property +widgets + widget name=NF_PAGE_COUNT/ + widget name=NF_PAGE_START/ + widget name=NF_RESTART_NUMBERING/ + widget name=NF_SET_PAGE_NUMBER/ + widget name=PB_PAGE_PROPERTIES/ +/widgets + /object /interface commit 1a220a5791202d7dd881bbcee8e1b4ff1002ac6d Author: Caolán McNamara caol...@redhat.com Date: Wed Jan 30 21:22:45 2013 + HIG: access key for listbox Change-Id: I20f85de6c529b5a448f87ab73d7373532da7ab8c diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui index 0c644a1..958eb25 100644 --- a/sw/uiconfig/swriter/ui/titlepage.ui +++ b/sw/uiconfig/swriter/ui/titlepage.ui @@ -462,7 +462,21 @@ object class=GtkBox id=box2 property name=visibleTrue/property property name=can_focusFalse/property -property name=spacing5/property +property name=spacing12/property +child + object class=GtkLabel id=label4 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label translatable=yes_Style:/property +property name=use_underlineTrue/property +property name=mnemonic_widgetLB_PAGE_PROPERTIES/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child child object class=GtkComboBox id=LB_PAGE_PROPERTIES property name=visibleTrue/property @@ -471,7 +485,7 @@ packing property name=expandTrue/property property name=fillTrue/property -property name=position0/property +property name=position1/property /packing /child child @@ -484,7 +498,7 @@ packing property name=expandFalse/property property name=fillTrue/property -property name=position1/property +property name=position2/property /packing /child /object commit c3fc293b584b4e62acb4b35ed389392fe2a81d41 Author: Caolán McNamara caol...@redhat.com Date: Wed Jan 30 21:10:51 2013 + HIG: 6 pixels vertical padding Change-Id: I8699539b79c5db10f4cf5d79028cabb10cd09164 diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui index b08f7f6..0c644a1 100644 --- a/sw/uiconfig/swriter/ui/titlepage.ui +++ b/sw/uiconfig/swriter/ui/titlepage.ui @@ -89,6 +89,7 @@ object class=GtkAlignment id=alignment1 property name=visibleTrue/property property name=can_focusFalse/property +property name=top_padding6/property property name=left_padding12/property child object class=GtkGrid id=grid1 @@ -289,6 +290,7 @@ object class=GtkAlignment id=alignment2 property name=visibleTrue/property property name=can_focusFalse/property +property name=top_padding6/property property name=left_padding12/property child object class=GtkBox id=box3 commit 1236f3188f4befd068cc770781d18522b84ae01d Author: Caolán McNamara caol...@redhat.com Date: Wed Jan 30 21:08:40 2013 + HIG: indent dependent hierarchy by 12 pixels Change-Id: I5beec3eb7d8ede3c91b63955285a813af16bc43a diff --git
[Libreoffice-commits] .: sc/source
sc/source/filter/excel/xlformula.cxx | 128 +--
sc/source/filter/oox/formulabase.cxx | 98 +-
2 files changed, 158 insertions(+), 68 deletions(-)
New commits:
commit 24bce470788aa34e5e1bb001250bfa14cee1c75e
Author: Eike Rathke er...@redhat.com
Date: Thu Jan 31 00:53:05 2013 +0100
import/export new Excel 2013 ODF functions, fdo#60032
Change-Id: I8cf726ce5132f0cb712b30a76a76b152a681f4da
diff --git a/sc/source/filter/excel/xlformula.cxx
b/sc/source/filter/excel/xlformula.cxx
index 0cee777..27cbab0 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -370,13 +370,103 @@ static const XclFunctionInfo saFuncTable_Oox[] =
{ ocIfError,255,3, 3, V, { RO_E, VO, RO },
EXC_FUNCFLAG_EXPORTONLY, EXC_FUNCNAME( IFERROR ) }
};
-/** Functions new in Excel 2013. */
+
+#define EXC_FUNCENTRY_V_VR( opcode, minparam, maxparam, flags, asciiname ) \
+{ opcode, NOID, minparam, maxparam, V, { VR },
EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }, \
+{ opcode, 255, (minparam)+1, (maxparam)+1, V, { RO_E, RO },
EXC_FUNCFLAG_EXPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }
+
+#define EXC_FUNCENTRY_V_VR_IMPORT( opcode, minparam, maxparam, flags,
asciiname ) \
+{ opcode, NOID, minparam, maxparam, V, { VR },
EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }
+
+#define EXC_FUNCENTRY_A_VR( opcode, minparam, maxparam, flags, asciiname ) \
+{ opcode, NOID, minparam, maxparam, A, { VR },
EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }, \
+{ opcode, 255, (minparam)+1, (maxparam)+1, A, { RO_E, RO },
EXC_FUNCFLAG_EXPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }
+
+#define EXC_FUNCENTRY_V_RO( opcode, minparam, maxparam, flags, asciiname ) \
+{ opcode, NOID, minparam, maxparam, V, { RO },
EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }, \
+{ opcode, 255, (minparam)+1, (maxparam)+1, V, { RO_E, RO },
EXC_FUNCFLAG_EXPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }
+
+// implicit maxparam=MX
+#define EXC_FUNCENTRY_V_RX( opcode, minparam, maxparam, flags, asciiname ) \
+{ opcode, NOID, minparam, MX, V, { RX },
EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }, \
+{ opcode, 255, (minparam)+1, MX, V, { RO_E, RX },
EXC_FUNCFLAG_EXPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }
+
+/** Functions new in Excel 2013.
+
+See
http://office.microsoft.com/en-us/excel-help/new-functions-in-excel-2013-HA103980604.aspx
+Most functions apparently were added for ODF1.2 ODFF / OpenFormula
+compatibility.
+
+Functions with EXC_FUNCENTRY_V_VR_IMPORT are rewritten in
+sc/source/filter/excel/xeformula.cxx during export for BIFF, OOXML export
+uses a different mapping but still uses this mapping here to determine the
+feature set.
+
+FIXME: either have the exporter determine the feature set from the active
+mapping, preferred, or enhance this mapping here such that for OOXML the
+rewrite can be overridden.
+
+@See sc/source/filter/oox/formulabase.cxx saFuncTable2013 for V,VR,RO,...
+ */
static const XclFunctionInfo saFuncTable_2013[] =
{
-{ ocIfNA, NOID, 2, 2, V, { VO, RO },
EXC_FUNCFLAG_IMPORTONLY, EXC_FUNCNAME( IFNA ) },
-{ ocIfNA, 255,3, 3, V, { RO_E, VO, RO },
EXC_FUNCFLAG_EXPORTONLY, EXC_FUNCNAME( IFNA ) }
+EXC_FUNCENTRY_V_VR_IMPORT( ocArcCot,1, 1, 0, ACOT ),
+EXC_FUNCENTRY_V_VR_IMPORT( ocArcCotHyp, 1, 1, 0, ACOTH ),
+EXC_FUNCENTRY_V_VR( ocArabic,1, 1, 0, ARABIC ),
+EXC_FUNCENTRY_V_VR( ocBase, 2, 3, 0, BASE ),
+EXC_FUNCENTRY_V_VR( ocB, 3, 4, 0,
BINOM.DIST.RANGE ),
+EXC_FUNCENTRY_V_VR( ocBitAnd,2, 2, 0, BITAND ),
+EXC_FUNCENTRY_V_VR( ocBitLshift, 2, 2, 0, BITLSHIFT ),
+EXC_FUNCENTRY_V_VR( ocBitOr, 2, 2, 0, BITOR ),
+EXC_FUNCENTRY_V_VR( ocBitRshift, 2, 2, 0, BITRSHIFT ),
+EXC_FUNCENTRY_V_VR( ocBitXor,2, 2, 0, BITXOR ),
+/* FIXME: CEILING.MATH is our/ODFF CEILING, but we have special handling
+ * for the weird Excel CEILING behavior, check that and unify or diversify.
+ * */
+EXC_FUNCENTRY_V_VR( ocNoName,1, 3, 0, CEILING.MATH ),
+EXC_FUNCENTRY_V_VR( ocKombin2, 2, 2, 0, COMBINA ),
+EXC_FUNCENTRY_V_VR_IMPORT( ocCot, 1, 1, 0, COT ),
+EXC_FUNCENTRY_V_VR_IMPORT( ocCotHyp,1, 1, 0, COTH ),
+EXC_FUNCENTRY_V_VR_IMPORT( ocCosecant, 1, 1, 0, CSC ),
+EXC_FUNCENTRY_V_VR_IMPORT( ocCosecantHyp, 1, 1, 0, CSCH ),
+EXC_FUNCENTRY_V_VR( ocGetDiffDate, 2, 2, 0, DAYS ),
+EXC_FUNCENTRY_V_VR( ocDecimal, 2, 2, 0,
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/column.hxx|2 ++
sc/inc/document.hxx | 12
sc/inc/table.hxx |2 ++
sc/source/core/data/column.cxx | 35 +++
sc/source/core/data/document.cxx | 16
sc/source/core/data/table2.cxx | 12
sc/source/ui/app/scmod.cxx | 29 +++--
7 files changed, 102 insertions(+), 6 deletions(-)
New commits:
commit 54ebe3df4a4c24dec7c38487a7da387fee266321
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Jan 30 15:55:58 2013 -0500
bnc#615317: Recompile cells with #NAME! for English function name option.
When the option for using English function name changes, we should
re-compile
all cells with #NAME! as the error may have been caused by unresolved
function
name which may be fixed after the option change.
Change-Id: Id340ce9b5db3ed368b98e814861be5c3f96df071
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index f4370a9..f6dff3b 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -251,6 +251,8 @@ public:
voidCompileAll();
voidCompileXML( ScProgress rProgress );
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
voidResetChanged( SCROW nStartRow, SCROW nEndRow );
boolUpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1,
SCROW nRow1, SCTAB nTab1,
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c3dd990..6483c65 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -860,6 +860,18 @@ public:
voidCompileAll();
voidCompileXML();
+/**
+ * Re-compile formula cells with error.
+ *
+ * @param nErrCode specified error code to match. Only those cells with
+ * this error code will be re-compiled. If this value is
+ * 0, cells with any error values will be re-compiled.
+ *
+ * @return true if at least one cell is re-compiled, false if no cells are
+ * re-compiled.
+ */
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
ScAutoNameCache* GetAutoNameCache() { return pAutoNameCache; }
SC_DLLPUBLIC void SetAutoNameCache( ScAutoNameCache* pCache
);
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 30eb97a..fd2aece 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -447,6 +447,8 @@ public:
voidCompileAll();
voidCompileXML( ScProgress rProgress );
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
voidUpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1,
SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 01f85fe..b74d325 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2135,6 +2135,41 @@ void ScColumn::CompileXML( ScProgress rProgress )
}
}
+bool ScColumn::CompileErrorCells(sal_uInt16 nErrCode)
+{
+if (maItems.empty())
+return false;
+
+bool bCompiled = false;
+std::vectorColEntry::iterator it = maItems.begin(), itEnd =
maItems.end();
+for (; it != itEnd; ++it)
+{
+ScBaseCell* pCell = it-pCell;
+if (pCell-GetCellType() != CELLTYPE_FORMULA)
+// Not a formula cell. Skip it.
+continue;
+
+ScFormulaCell* pFCell = static_castScFormulaCell*(pCell);
+sal_uInt16 nCurError = pFCell-GetRawError();
+if (!nCurError)
+// It's not an error cell. Skip it.
+continue;
+
+if (nErrCode nCurError != nErrCode)
+// Error code is specified, and it doesn't match. Skip it.
+continue;
+
+pFCell-GetCode()-SetCodeError(0);
+pFCell-SetCompile(true);
+OUStringBuffer aBuf;
+pFCell-GetFormula(aBuf, pDocument-GetGrammar());
+pFCell-Compile(aBuf.makeStringAndClear(), false,
pDocument-GetGrammar());
+
+bCompiled = true;
+}
+
+return bCompiled;
+}
void ScColumn::CalcAfterLoad()
{
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 1b11231..8667b3f 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3381,6 +3381,22 @@ void ScDocument::CompileXML()
SetAutoCalc( bOldAutoCalc );
}
+bool ScDocument::CompileErrorCells(sal_uInt16 nErrCode)
+{
+bool bCompiled = false;
+TableContainer::iterator it = maTabs.begin(), itEnd = maTabs.end();
+for (; it != itEnd; ++it)
+{
+ScTable* pTab = *it;
+if (!pTab)
+continue;
+
+if (pTab-CompileErrorCells(nErrCode))
+bCompiled = true;
+}
+
+return bCompiled;
+}
void ScDocument::CalcAfterLoad()
{
diff --git
[Libreoffice-commits] .:
0 files changed New commits: commit 8597e8e4f1b92c55b72aae8462d2361cbd8652dc Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Wed Jan 30 19:24:54 2013 -0500 Oops the last commit is for bnc#615357. Sorry. Change-Id: I3ce101b52bfbede14d0fb0ef453b04f882de57a0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/inc sc/source
sc/inc/column.hxx|2 ++
sc/inc/document.hxx | 12
sc/inc/table.hxx |2 ++
sc/source/core/data/column.cxx | 35 +++
sc/source/core/data/document.cxx | 16
sc/source/core/data/table2.cxx | 12
sc/source/ui/app/scmod.cxx | 29 +++--
7 files changed, 102 insertions(+), 6 deletions(-)
New commits:
commit 54d2ba39f961996667a6de9e443fb9c7225a508f
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Jan 30 15:55:58 2013 -0500
bnc#615357: Recompile cells with #NAME! for English function name option.
When the option for using English function name changes, we should
re-compile
all cells with #NAME! as the error may have been caused by unresolved
function
name which may be fixed after the option change.
Change-Id: Id340ce9b5db3ed368b98e814861be5c3f96df071
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 446f4de..43a6c10 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -275,6 +275,8 @@ public:
voidCompileAll();
voidCompileXML( ScProgress rProgress );
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
voidResetChanged( SCROW nStartRow, SCROW nEndRow );
boolUpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1,
SCROW nRow1, SCTAB nTab1,
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 7a8cf20..84791a0 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -882,6 +882,18 @@ public:
voidCompileAll();
voidCompileXML();
+/**
+ * Re-compile formula cells with error.
+ *
+ * @param nErrCode specified error code to match. Only those cells with
+ * this error code will be re-compiled. If this value is
+ * 0, cells with any error values will be re-compiled.
+ *
+ * @return true if at least one cell is re-compiled, false if no cells are
+ * re-compiled.
+ */
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
ScAutoNameCache* GetAutoNameCache() { return pAutoNameCache; }
SC_DLLPUBLIC void SetAutoNameCache( ScAutoNameCache* pCache
);
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 78cd977..60d440e 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -458,6 +458,8 @@ public:
voidCompileAll();
voidCompileXML( ScProgress rProgress );
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
voidUpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1,
SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 79bf31f..df78d02 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2078,6 +2078,41 @@ void ScColumn::CompileXML( ScProgress rProgress )
}
}
+bool ScColumn::CompileErrorCells(sal_uInt16 nErrCode)
+{
+if (maItems.empty())
+return false;
+
+bool bCompiled = false;
+std::vectorColEntry::iterator it = maItems.begin(), itEnd =
maItems.end();
+for (; it != itEnd; ++it)
+{
+ScBaseCell* pCell = it-pCell;
+if (pCell-GetCellType() != CELLTYPE_FORMULA)
+// Not a formula cell. Skip it.
+continue;
+
+ScFormulaCell* pFCell = static_castScFormulaCell*(pCell);
+sal_uInt16 nCurError = pFCell-GetRawError();
+if (!nCurError)
+// It's not an error cell. Skip it.
+continue;
+
+if (nErrCode nCurError != nErrCode)
+// Error code is specified, and it doesn't match. Skip it.
+continue;
+
+pFCell-GetCode()-SetCodeError(0);
+pFCell-SetCompile(true);
+OUStringBuffer aBuf;
+pFCell-GetFormula(aBuf, pDocument-GetGrammar());
+pFCell-Compile(aBuf.makeStringAndClear(), false,
pDocument-GetGrammar());
+
+bCompiled = true;
+}
+
+return bCompiled;
+}
void ScColumn::CalcAfterLoad()
{
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index f17e72d..e9309d7 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3417,6 +3417,22 @@ void ScDocument::CompileXML()
SetAutoCalc( bOldAutoCalc );
}
+bool ScDocument::CompileErrorCells(sal_uInt16 nErrCode)
+{
+bool bCompiled = false;
+TableContainer::iterator it = maTabs.begin(), itEnd = maTabs.end();
+for (; it != itEnd; ++it)
+{
+ScTable* pTab = *it;
+if (!pTab)
+continue;
+
+if (pTab-CompileErrorCells(nErrCode))
+bCompiled = true;
+}
+
+return bCompiled;
+}
void ScDocument::CalcAfterLoad()
{
diff --git
Re: [Libreoffice-commits] replaceAll
On Wed, 2013-01-30 at 16:26 +0100, Stephan Bergmann wrote: fix for the awkward OUString::replaceAll() behaviour Seeing this, that's the reason I've always been unhappy with such a replaceAll function: While it may appear obviously useful, it easily leads to broken code (like if rInfo1 is wanna bet $2 this doesn't work?, say, in the above snippet). We could deprecate it. Do we have a nice macro wrapped around some magic gcc: really warn if return value unused attribute - I assume there is one of those - that might help make it more sane ? ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - sc/source sd/source sw/source
sc/source/ui/inc/fuconstr.hxx|4
sd/source/ui/inc/fuconstr.hxx|2 --
sw/source/ui/inc/drawbase.hxx|2 --
sw/source/ui/inc/drwbassh.hxx|2 --
sw/source/ui/inc/drwtxtsh.hxx|3 ---
sw/source/ui/ribbar/drawbase.cxx |2 --
6 files changed, 15 deletions(-)
New commits:
commit 56bb7744f4a4612ffe75e56d51ba95c559435663
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Jan 31 09:05:16 2013 +0900
Drop unused member variables
Change-Id: Ied80983dc64f1e4e7ad34ebd9cc034054a17b6cc
diff --git a/sw/source/ui/inc/drwbassh.hxx b/sw/source/ui/inc/drwbassh.hxx
index b203f2d..5cd5b42 100644
--- a/sw/source/ui/inc/drwbassh.hxx
+++ b/sw/source/ui/inc/drwbassh.hxx
@@ -31,8 +31,6 @@ class SwDrawBaseShell: public SwBaseShell
SwDrawBase* pDrawActual;
sal_uInt16 eDrawMode;
-sal_BoolbRotate : 1;
-sal_BoolbSelMove: 1;
DECL_LINK( CheckGroupShapeNameHdl, AbstractSvxNameDialog* );
DECL_LINK(ValidatePosition, SvxSwFrameValidation* );
diff --git a/sw/source/ui/inc/drwtxtsh.hxx b/sw/source/ui/inc/drwtxtsh.hxx
index 179b2fe..e7d687b 100644
--- a/sw/source/ui/inc/drwtxtsh.hxx
+++ b/sw/source/ui/inc/drwtxtsh.hxx
@@ -34,9 +34,6 @@ class SwDrawTextShell: public SfxShell
SdrView *pSdrView;
-sal_BoolbRotate : 1;
-sal_BoolbSelMove: 1;
-
voidSetAttrToMarked(const SfxItemSet rAttr);
voidInsertSymbol(SfxRequest rReq);
sal_BoolIsTextEdit();
commit 270acb88ce12a0a4843ab9ebce194d0a07e2075a
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Jan 31 09:03:34 2013 +0900
Drop unused #define
Change-Id: I2831c6a9c738d3ccacb1e7856675f409948723c9
diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx
index 78fe5d5..a3193e3 100644
--- a/sw/source/ui/ribbar/drawbase.cxx
+++ b/sw/source/ui/ribbar/drawbase.cxx
@@ -42,8 +42,6 @@ using namespace ::com::sun::star;
extern bool bNoInterrupt; // in mainwn.cxx
-#define MINMOVE
((sal_uInt16)m_pSh-GetOut()-PixelToLogic(Size(m_pSh-GetDrawView()-GetMarkHdlSizePixel()/2,0)).Width())
-
/*
|*
commit 3a4575115b9cd26c15692501be59dc362ef0481e
Author: Takeshi Abe t...@fixedpoint.jp
Date: Wed Jan 30 23:32:17 2013 +0900
MIN_FREEHAND_DISTANCE is used nowhere
Change-Id: I3111c8fd60089302d7eee51df0ac81ae1a6f5eab
diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx
index c50feba..ab24e89 100644
--- a/sc/source/ui/inc/fuconstr.hxx
+++ b/sc/source/ui/inc/fuconstr.hxx
@@ -23,10 +23,6 @@
#include fudraw.hxx
-//
-
-#define MIN_FREEHAND_DISTANCE 10
-
/** Draw rectangle */
class FuConstruct : public FuDraw
{
diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx
index 20a0bde..8af7262 100644
--- a/sd/source/ui/inc/fuconstr.hxx
+++ b/sd/source/ui/inc/fuconstr.hxx
@@ -38,8 +38,6 @@ class FuConstruct
: public FuDraw
{
public:
-static const int MIN_FREEHAND_DISTANCE = 10;
-
TYPEINFO();
virtual void DoExecute( SfxRequest rReq );
diff --git a/sw/source/ui/inc/drawbase.hxx b/sw/source/ui/inc/drawbase.hxx
index 739ddd4..15392f6 100644
--- a/sw/source/ui/inc/drawbase.hxx
+++ b/sw/source/ui/inc/drawbase.hxx
@@ -27,8 +27,6 @@ class SwEditWin;
class KeyEvent;
class MouseEvent;
-#define MIN_FREEHAND_DISTANCE 10
-
/*
|*
|* base class for all functions
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/core/data/column.cxx |1 - sc/source/ui/app/scmod.cxx |3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 11cfcf401a68cbaf5dfe0a309fd482d3a3fbdff6 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Wed Jan 30 20:49:15 2013 -0500 Don't overwrite bCalcAll when it's already set remove SetCompile(). Change-Id: Ieaf84e8d36efa8314729903be029f83c31bcbdf3 diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index b74d325..f29dc2d 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -2160,7 +2160,6 @@ bool ScColumn::CompileErrorCells(sal_uInt16 nErrCode) continue; pFCell-GetCode()-SetCodeError(0); -pFCell-SetCompile(true); OUStringBuffer aBuf; pFCell-GetFormula(aBuf, pDocument-GetGrammar()); pFCell-Compile(aBuf.makeStringAndClear(), false, pDocument-GetGrammar()); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 38fc9ec..8506f12 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1327,7 +1327,8 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet ) // Re-compile cells with name error, and recalc if at least one cell // has been re-compiled. In the future we may want to find a way to // recalc only those that are affected. -bCalcAll = pDoc-CompileErrorCells(ScErrorCodes::errNoName); +if (pDoc-CompileErrorCells(ScErrorCodes::errNoName)) +bCalcAll = true; } if ( pDoc bCalcAll ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - 2 commits - sc/source
sc/source/core/data/column.cxx |3 +-- sc/source/ui/app/scmod.cxx |3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 399af06742cf7bd0838a9e987a77ac532efce365 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Wed Jan 30 21:00:48 2013 -0500 Fix the build. Change-Id: Iea8a02ceab7b603b5363b9df74e1381f152d70e1 diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index cc5a5c6..31ead19 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -2103,7 +2103,7 @@ bool ScColumn::CompileErrorCells(sal_uInt16 nErrCode) continue; pFCell-GetCode()-SetCodeError(0); -OUStringBuffer aBuf; +rtl::OUStringBuffer aBuf; pFCell-GetFormula(aBuf, pDocument-GetGrammar()); pFCell-Compile(aBuf.makeStringAndClear(), false, pDocument-GetGrammar()); commit 5f7e5fd62233cfd37d31d059480685f341063a0e Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Wed Jan 30 20:49:15 2013 -0500 Don't overwrite bCalcAll when it's already set remove SetCompile(). Change-Id: Ieaf84e8d36efa8314729903be029f83c31bcbdf3 diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index df78d02..cc5a5c6 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -2103,7 +2103,6 @@ bool ScColumn::CompileErrorCells(sal_uInt16 nErrCode) continue; pFCell-GetCode()-SetCodeError(0); -pFCell-SetCompile(true); OUStringBuffer aBuf; pFCell-GetFormula(aBuf, pDocument-GetGrammar()); pFCell-Compile(aBuf.makeStringAndClear(), false, pDocument-GetGrammar()); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index e76370c..04b2f6c 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1343,7 +1343,8 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet ) // Re-compile cells with name error, and recalc if at least one cell // has been re-compiled. In the future we may want to find a way to // recalc only those that are affected. -bCalcAll = pDoc-CompileErrorCells(ScErrorCodes::errNoName); +if (pDoc-CompileErrorCells(ScErrorCodes::errNoName)) +bCalcAll = true; } if ( pDoc bCalcAll ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/inc sc/source
sc/inc/column.hxx|2 ++
sc/inc/document.hxx | 12
sc/inc/table.hxx |2 ++
sc/source/core/data/column.cxx | 34 ++
sc/source/core/data/document.cxx | 16
sc/source/core/data/table2.cxx | 12
sc/source/ui/app/scmod.cxx | 30 --
7 files changed, 102 insertions(+), 6 deletions(-)
New commits:
commit cad24bc49681e0a765bee01b00825ab02d537705
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Jan 30 15:55:58 2013 -0500
bnc#615357: Recompile cells with #NAME! for English function name option.
When the option for using English function name changes, we should
re-compile
all cells with #NAME! as the error may have been caused by unresolved
function
name which may be fixed after the option change.
Change-Id: Id340ce9b5db3ed368b98e814861be5c3f96df071
Reviewed-on: https://gerrit.libreoffice.org/1931
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 3e927c8..930caba 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -250,6 +250,8 @@ public:
voidCompileAll();
voidCompileXML( ScProgress rProgress );
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
voidResetChanged( SCROW nStartRow, SCROW nEndRow );
boolUpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1,
SCROW nRow1, SCTAB nTab1,
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c7c09d8..31c5ac2 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -863,6 +863,18 @@ public:
voidCompileAll();
voidCompileXML();
+/**
+ * Re-compile formula cells with error.
+ *
+ * @param nErrCode specified error code to match. Only those cells with
+ * this error code will be re-compiled. If this value is
+ * 0, cells with any error values will be re-compiled.
+ *
+ * @return true if at least one cell is re-compiled, false if no cells are
+ * re-compiled.
+ */
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
ScAutoNameCache* GetAutoNameCache() { return pAutoNameCache; }
SC_DLLPUBLIC void SetAutoNameCache( ScAutoNameCache* pCache
);
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 26d5a69..061c830 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -446,6 +446,8 @@ public:
voidCompileAll();
voidCompileXML( ScProgress rProgress );
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
voidUpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1,
SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 462abe7..5fb98a2 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2149,6 +2149,40 @@ void ScColumn::CompileXML( ScProgress rProgress )
}
}
+bool ScColumn::CompileErrorCells(sal_uInt16 nErrCode)
+{
+if (maItems.empty())
+return false;
+
+bool bCompiled = false;
+std::vectorColEntry::iterator it = maItems.begin(), itEnd =
maItems.end();
+for (; it != itEnd; ++it)
+{
+ScBaseCell* pCell = it-pCell;
+if (pCell-GetCellType() != CELLTYPE_FORMULA)
+// Not a formula cell. Skip it.
+continue;
+
+ScFormulaCell* pFCell = static_castScFormulaCell*(pCell);
+sal_uInt16 nCurError = pFCell-GetRawError();
+if (!nCurError)
+// It's not an error cell. Skip it.
+continue;
+
+if (nErrCode nCurError != nErrCode)
+// Error code is specified, and it doesn't match. Skip it.
+continue;
+
+pFCell-GetCode()-SetCodeError(0);
+OUStringBuffer aBuf;
+pFCell-GetFormula(aBuf, pDocument-GetGrammar());
+pFCell-Compile(aBuf.makeStringAndClear(), false,
pDocument-GetGrammar());
+
+bCompiled = true;
+}
+
+return bCompiled;
+}
void ScColumn::CalcAfterLoad()
{
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 95018d7..8cc1713 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3377,6 +3377,22 @@ void ScDocument::CompileXML()
SetAutoCalc( bOldAutoCalc );
}
+bool ScDocument::CompileErrorCells(sal_uInt16 nErrCode)
+{
+bool bCompiled = false;
+TableContainer::iterator it = maTabs.begin(), itEnd = maTabs.end();
+for (; it != itEnd; ++it)
+{
+ScTable* pTab = *it;
+if (!pTab)
+continue;
+
+if (pTab-CompileErrorCells(nErrCode))
+
[Libreoffice-commits] .: sc/CppunitTest_sc_macros_test.mk sc/qa test/inc test/source
dev/null |binary
sc/CppunitTest_sc_macros_test.mk |1
sc/qa/extras/macros-test.cxx | 50 +++--
sc/qa/extras/scannotationobj.cxx |1
sc/qa/extras/scannotationsobj.cxx |1
sc/qa/extras/sccellrangeobj.cxx|2 -
sc/qa/extras/scdatabaserangeobj.cxx|9 -
sc/qa/extras/scdatapilotfieldobj.cxx |7
sc/qa/extras/scdatapilottableobj.cxx |6 +--
sc/qa/extras/sceditfieldobj-cell.cxx |5 ++
sc/qa/extras/sceditfieldobj-header.cxx |5 ++
sc/qa/extras/scmodelobj.cxx|6 +++
sc/qa/extras/scnamedrangeobj.cxx |2 -
sc/qa/extras/scnamedrangesobj.cxx |7
sc/qa/extras/sctablesheetobj.cxx |2 -
sc/qa/extras/sctablesheetsobj.cxx |1
sc/qa/extras/testdocuments/StarBasic.ods |binary
sc/qa/extras/testdocuments/TestAddress.xls |binary
sc/qa/extras/testdocuments/vba.xls |binary
test/inc/test/unoapi_test.hxx |2 -
test/source/unoapi_test.cxx| 11 +-
21 files changed, 56 insertions(+), 62 deletions(-)
New commits:
commit 7226ac25e2edb6ee27affd576f7aa600bb43520c
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Wed Jan 30 01:58:32 2013 -0200
Use a method from UnoApitest instead of implement a new one in calc
In calc, we see a lot of implementations of createFileURL. So get ride
of all it and start to use the UnoAPitest::createFileURL method.
Also, clean the UnoApiRest::createFileURL method, fix the path from
UnoApiTest and
moved some testing files to the right dir that the file belongs.
Conflicts:
sc/qa/extras/scoutlineobj.cxx
Change-Id: Ic02f13777503729ac70da590f4a42866f17ea9b2
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index 362a65e..66dd619 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \
svx \
svxcore \
test \
+subsequenttest \
tl \
tk \
ucbhelper \
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 364ca1b..96da0e2 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -29,7 +29,7 @@
*/
#include sal/config.h
-#include test/bootstrapfixture.hxx
+#include test/unoapi_test.hxx
#include unotest/macros_test.hxx
#include rtl/strbuf.hxx
#include osl/file.hxx
@@ -53,16 +53,11 @@ using namespace ::com::sun::star::uno;
/* Implementation of Macros test */
-class ScMacrosTest : public test::BootstrapFixture, public unotest::MacrosTest
+class ScMacrosTest : public UnoApiTest
{
public:
ScMacrosTest();
-void createFileURL(const rtl::OUString aFileBase, const rtl::OUString
aFileExtension, rtl::OUString rFilePath);
-
-virtual void setUp();
-virtual void tearDown();
-
void testStarBasic();
void testVba();
CPPUNIT_TEST_SUITE(ScMacrosTest);
@@ -77,25 +72,13 @@ public:
private:
uno::Referenceuno::XInterface m_xCalcComponent;
-rtl::OUString m_aBaseString;
};
-
-void ScMacrosTest::createFileURL(const rtl::OUString aFileBase, const
rtl::OUString aFileExtension, rtl::OUString rFilePath)
-{
-rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM(/));
-rtl::OUStringBuffer aBuffer( getSrcRootURL() );
-aBuffer.append(m_aBaseString).append(aSep).append(aFileExtension);
-aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
-rFilePath = aBuffer.makeStringAndClear();
-}
-
void ScMacrosTest::testStarBasic()
{
-const rtl::OUString
aFileNameBase(RTL_CONSTASCII_USTRINGPARAM(StarBasic.));
-rtl::OUString aFileExtension(ods);
+const OUString aFileNameBase(StarBasic.ods);
rtl::OUString aFileName;
-createFileURL(aFileNameBase, aFileExtension, aFileName);
+createFileURL(aFileNameBase, aFileName);
std::cout StarBasic test std::endl;
uno::Reference com::sun::star::lang::XComponent xComponent =
loadFromDesktop(aFileName);
@@ -122,7 +105,6 @@ void ScMacrosTest::testStarBasic()
xDocSh-DoClose();
}
-
void ScMacrosTest::testVba()
{
TestMacroInfo testInfo[] = {
@@ -136,11 +118,10 @@ void ScMacrosTest::testVba()
}
};
-rtl::OUString aFileExtension(xls);
for ( sal_uInt32 i=0; iSAL_N_ELEMENTS( testInfo ); ++i )
{
rtl::OUString aFileName;
-createFileURL(testInfo[i].sFileBaseName, aFileExtension, aFileName);
+createFileURL(testInfo[i].sFileBaseName + xls, aFileName);
uno::Reference com::sun::star::lang::XComponent xComponent =
loadFromDesktop(aFileName);
rtl::OUString sMsg( Failed to load + aFileName );
CPPUNIT_ASSERT_MESSAGE( rtl::OUStringToOString( sMsg,
RTL_TEXTENCODING_UTF8 ).getStr(), xComponent.is() );
@@ -164,27 +145,8 @@
[Libreoffice-commits] .: sc/source
sc/source/core/tool/typedstrdata.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 338140e5201bc23625eacd1a4740622e6241cbc2
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Jan 30 22:32:28 2013 -0500
bnc#492440: Sort autofilter popup items correctly.
Use locale-aware collator to sort strings, instead of using the
transliterator. The actual sorting algorithm for cell sort uses
collator. Let's be consistent with it.
Change-Id: I6729553ce92d50e45fa1ea6e1c35581fd791807d
diff --git a/sc/source/core/tool/typedstrdata.cxx
b/sc/source/core/tool/typedstrdata.cxx
index 811c5d8..71cf0fa 100644
--- a/sc/source/core/tool/typedstrdata.cxx
+++ b/sc/source/core/tool/typedstrdata.cxx
@@ -29,7 +29,7 @@
#include typedstrdata.hxx
#include global.hxx
-#include unotools/transliterationwrapper.hxx
+#include unotools/collatorwrapper.hxx
bool ScTypedStrData::LessCaseSensitive::operator() (const ScTypedStrData
left, const ScTypedStrData right) const
{
@@ -39,7 +39,7 @@ bool ScTypedStrData::LessCaseSensitive::operator() (const
ScTypedStrData left,
if (left.meStrType == Value)
return left.mfValue right.mfValue;
-return ScGlobal::GetCaseTransliteration()-compareString(
+return ScGlobal::GetCaseCollator()-compareString(
left.maStrValue, right.maStrValue) 0;
}
@@ -51,7 +51,7 @@ bool ScTypedStrData::LessCaseInsensitive::operator() (const
ScTypedStrData left
if (left.meStrType == Value)
return left.mfValue right.mfValue;
-return ScGlobal::GetpTransliteration()-compareString(
+return ScGlobal::GetCollator()-compareString(
left.maStrValue, right.maStrValue) 0;
}
@@ -63,7 +63,7 @@ bool ScTypedStrData::EqualCaseSensitive::operator() (const
ScTypedStrData left,
if (left.meStrType == Value left.mfValue != right.mfValue)
return false;
-return ScGlobal::GetCaseTransliteration()-compareString(
+return ScGlobal::GetCaseCollator()-compareString(
left.maStrValue, right.maStrValue) == 0;
}
@@ -75,7 +75,7 @@ bool ScTypedStrData::EqualCaseInsensitive::operator() (const
ScTypedStrData lef
if (left.meStrType == Value left.mfValue != right.mfValue)
return false;
-return ScGlobal::GetpTransliteration()-compareString(
+return ScGlobal::GetCollator()-compareString(
left.maStrValue, right.maStrValue) == 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - sc/source
sc/source/core/tool/typedstrdata.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 93b167475be204092a171f93e40861296d10fc4a
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Jan 30 22:32:28 2013 -0500
bnc#492440: Sort autofilter popup items correctly.
Use locale-aware collator to sort strings, instead of using the
transliterator. The actual sorting algorithm for cell sort uses
collator. Let's be consistent with it.
Change-Id: I6729553ce92d50e45fa1ea6e1c35581fd791807d
diff --git a/sc/source/core/tool/typedstrdata.cxx
b/sc/source/core/tool/typedstrdata.cxx
index 8faaace..dc28f2d 100644
--- a/sc/source/core/tool/typedstrdata.cxx
+++ b/sc/source/core/tool/typedstrdata.cxx
@@ -29,7 +29,7 @@
#include typedstrdata.hxx
#include global.hxx
-#include unotools/transliterationwrapper.hxx
+#include unotools/collatorwrapper.hxx
bool ScTypedStrData::LessCaseSensitive::operator() (const ScTypedStrData
left, const ScTypedStrData right) const
{
@@ -39,7 +39,7 @@ bool ScTypedStrData::LessCaseSensitive::operator() (const
ScTypedStrData left,
if (left.meStrType == Value)
return left.mfValue right.mfValue;
-return ScGlobal::GetCaseTransliteration()-compareString(
+return ScGlobal::GetCaseCollator()-compareString(
left.maStrValue, right.maStrValue) 0;
}
@@ -51,7 +51,7 @@ bool ScTypedStrData::LessCaseInsensitive::operator() (const
ScTypedStrData left
if (left.meStrType == Value)
return left.mfValue right.mfValue;
-return ScGlobal::GetpTransliteration()-compareString(
+return ScGlobal::GetCollator()-compareString(
left.maStrValue, right.maStrValue) 0;
}
@@ -63,7 +63,7 @@ bool ScTypedStrData::EqualCaseSensitive::operator() (const
ScTypedStrData left,
if (left.meStrType == Value left.mfValue != right.mfValue)
return false;
-return ScGlobal::GetCaseTransliteration()-compareString(
+return ScGlobal::GetCaseCollator()-compareString(
left.maStrValue, right.maStrValue) == 0;
}
@@ -75,7 +75,7 @@ bool ScTypedStrData::EqualCaseInsensitive::operator() (const
ScTypedStrData lef
if (left.meStrType == Value left.mfValue != right.mfValue)
return false;
-return ScGlobal::GetpTransliteration()-compareString(
+return ScGlobal::GetCollator()-compareString(
left.maStrValue, right.maStrValue) == 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/unit/subsequent_export-test.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 21a807456e4e7f141bb0165b43323c2202c0273c
Author: Tor Lillqvist t...@iki.fi
Date: Thu Jan 31 07:55:31 2013 +0200
Meh, use SAL_PRIdINT32
Change-Id: I8ce0d94e7946175d1b287ba85567f9bb414f4152
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 5829f43..d39eb11 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -363,7 +363,7 @@ void ScExportTest::testMiscRowHeightExport()
int nExpectedHeight = aTestValues[ index ].pData[ i
].nExpectedHeight;
for ( ; nRow = nEndRow; ++nRow )
{
-printf(\t checking row %ld for height %d\n, nRow,
nExpectedHeight );
+printf(\t checking row %SAL_PRIdINT32 for height %d\n,
nRow, nExpectedHeight );
int nHeight = sc::TwipsToHMM( pDoc-GetRowHeight(nRow, nTab,
false) );
CPPUNIT_ASSERT_EQUAL(nExpectedHeight, nHeight);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/unit/subsequent_export-test.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 561ec646ff08bf455720c5549a73fd54cdddeaa7
Author: Tor Lillqvist t...@iki.fi
Date: Thu Jan 31 08:54:53 2013 +0200
WaE: C++11 requires a space between literal and identifier
Change-Id: I3351298e338315881bc8fa344849f00ee4438059
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index d39eb11..220877d 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -363,7 +363,7 @@ void ScExportTest::testMiscRowHeightExport()
int nExpectedHeight = aTestValues[ index ].pData[ i
].nExpectedHeight;
for ( ; nRow = nEndRow; ++nRow )
{
-printf(\t checking row %SAL_PRIdINT32 for height %d\n,
nRow, nExpectedHeight );
+printf(\t checking row % SAL_PRIdINT32 for height %d\n,
nRow, nExpectedHeight );
int nHeight = sc::TwipsToHMM( pDoc-GetRowHeight(nRow, nTab,
false) );
CPPUNIT_ASSERT_EQUAL(nExpectedHeight, nHeight);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] replaceAll
On 2013-01-31 02:58, Michael Meeks wrote: We could deprecate it. Do we have a nice macro wrapped around some magic gcc: really warn if return value unused attribute - I assume there is one of those - that might help make it more sane ? Maybe we need a SAL_ERROR_IF_UNUSED macro for those cases where ignoring the return value is Just Plain Wrong? (assuming such a thing is possible) Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: resolved fdo#60043 write correct IM* function names
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1920 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1920 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f119f92096329432488503f36df670a4ce19b42 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: resolved fdo#60087 corrected .xlsx export of functions
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1929
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/29/1929/1
resolved fdo#60087 corrected .xlsx export of functions
Change-Id: I6c7ba47dde88a73d035b1db5f7f4cede78b262db
(cherry picked from commit 0c7a1b6e10011930b703897073b8d41e94f7d827)
---
M sc/source/filter/excel/xeformula.cxx
M sc/source/filter/oox/formulabase.cxx
2 files changed, 71 insertions(+), 41 deletions(-)
diff --git a/sc/source/filter/excel/xeformula.cxx
b/sc/source/filter/excel/xeformula.cxx
index 603ee9d..893321b 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1406,20 +1406,24 @@
void XclExpFmlaCompImpl::PrepareFunction( XclExpFuncData rFuncData )
{
-switch( rFuncData.GetOpCode() )
+// For OOXML these are not rewritten anymore.
+if (GetOutput() != EXC_OUTPUT_XML_2007)
{
-case ocCosecant:// simulate CSC(x) by (1/SIN(x))
-case ocSecant: // simulate SEC(x) by (1/COS(x))
-case ocCot: // simulate COT(x) by (1/TAN(x))
-case ocCosecantHyp: // simulate CSCH(x) by (1/SINH(x))
-case ocSecantHyp: // simulate SECH(x) by (1/COSH(x))
-case ocCotHyp: // simulate COTH(x) by (1/TANH(x))
-AppendIntToken( 1 );
-break;
-case ocArcCot: // simulate ACOT(x) by (PI/2-ATAN(x))
-AppendNumToken( F_PI2 );
-break;
-default:;
+switch( rFuncData.GetOpCode() )
+{
+case ocCosecant:// simulate CSC(x) by (1/SIN(x))
+case ocSecant: // simulate SEC(x) by (1/COS(x))
+case ocCot: // simulate COT(x) by (1/TAN(x))
+case ocCosecantHyp: // simulate CSCH(x) by (1/SINH(x))
+case ocSecantHyp: // simulate SECH(x) by (1/COSH(x))
+case ocCotHyp: // simulate COTH(x) by (1/TANH(x))
+AppendIntToken( 1 );
+break;
+case ocArcCot: // simulate ACOT(x) by
(PI/2-ATAN(x))
+AppendNumToken( F_PI2 );
+break;
+default:;
+}
}
}
@@ -1468,12 +1472,20 @@
case ocCosecantHyp: // simulate CSCH(x) by (1/SINH(x))
case ocSecantHyp: // simulate SECH(x) by (1/COSH(x))
case ocCotHyp: // simulate COTH(x) by (1/TANH(x))
-AppendBinaryOperatorToken( EXC_TOKID_DIV, true );
-AppendParenToken();
+// For OOXML not rewritten anymore.
+if (GetOutput() != EXC_OUTPUT_XML_2007)
+{
+AppendBinaryOperatorToken( EXC_TOKID_DIV, true );
+AppendParenToken();
+}
break;
case ocArcCot: // simulate ACOT(x) by
(PI/2-ATAN(x))
-AppendBinaryOperatorToken( EXC_TOKID_SUB, true );
-AppendParenToken();
+// For OOXML not rewritten anymore.
+if (GetOutput() != EXC_OUTPUT_XML_2007)
+{
+AppendBinaryOperatorToken( EXC_TOKID_SUB, true );
+AppendParenToken();
+}
break;
default:;
diff --git a/sc/source/filter/oox/formulabase.cxx
b/sc/source/filter/oox/formulabase.cxx
index 929e6b0..ec3c411 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -215,6 +215,8 @@
const sal_uInt16 FUNCFLAG_MACROCALL_NEW = FUNCFLAG_MACROCALL |
FUNCFLAG_MACROCALL_FN; /** New Excel functions not
defined in OOXML,
_xlfn. prefix in all formats. OOXML name
must exist. */
+const sal_uInt16 FUNCFLAG_BIFFIMPORTONLY= 0x0800; /// Only used in BIFF
binary import filter.
+const sal_uInt16 FUNCFLAG_BIFFEXPORTONLY= 0x1000; /// Only used in BIFF
binary export filter.
/// Converts a function library index (value of enum FunctionLibraryType) to
function flags.
#define FUNCLIB_TO_FUNCFLAGS( funclib_index ) static_cast sal_uInt16 (
static_cast sal_uInt8 ( funclib_index ) 12 )
@@ -235,14 +237,21 @@
FunctionParamInfo mpParamInfos[ FUNCINFO_PARAMINFOCOUNT ]; ///
Information about all parameters.
sal_uInt16 mnFlags;/// Additional flags.
-inline bool isSupported( bool bImportFilter ) const;
+inline bool isSupported( bool bImportFilter, FilterType eFilter )
const;
};
-inline bool FunctionData::isSupported( bool bImportFilter ) const
+inline bool FunctionData::isSupported( bool bImportFilter, FilterType eFilter
) const
Change in core[master]: Hyperlink is an optional property, fdo#58858
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1930
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/30/1930/1
Hyperlink is an optional property, fdo#58858
Change-Id: I30f2b0cdb72951a47cfd8d0091b5418fd59efe83
---
M sc/source/filter/xml/xmlexprt.cxx
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 5782dbc..2a595b0 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3095,9 +3095,16 @@
{
// #i66550 HLINK_FOR_SHAPES
rtl::OUString sHlink;
-uno::Reference beans::XPropertySet xProps( xShape, uno::UNO_QUERY );
-if ( xProps.is() )
-xProps-getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) = sHlink;
+try
+{
+uno::Reference beans::XPropertySet xProps( xShape,
uno::UNO_QUERY );
+if ( xProps.is() )
+xProps-getPropertyValue( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_HYPERLINK ) ) ) = sHlink;
+}
+catch ( const beans::UnknownPropertyException )
+{
+// no hyperlink property
+}
std::auto_ptr SvXMLElementExport pDrawA;
// enlose shapes with draw:a element only if sHlink contains
something
--
To view, visit https://gerrit.libreoffice.org/1930
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30f2b0cdb72951a47cfd8d0091b5418fd59efe83
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: bnc#615317: Recompile cells with #NAME! for English function...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1931
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/1931/1
bnc#615317: Recompile cells with #NAME! for English function name option.
When the option for using English function name changes, we should re-compile
all cells with #NAME! as the error may have been caused by unresolved function
name which may be fixed after the option change.
Change-Id: Id340ce9b5db3ed368b98e814861be5c3f96df071
---
M sc/inc/column.hxx
M sc/inc/document.hxx
M sc/inc/table.hxx
M sc/source/core/data/column.cxx
M sc/source/core/data/document.cxx
M sc/source/core/data/table2.cxx
M sc/source/ui/app/scmod.cxx
7 files changed, 102 insertions(+), 6 deletions(-)
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 3e927c8..930caba 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -250,6 +250,8 @@
voidCompileAll();
voidCompileXML( ScProgress rProgress );
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
voidResetChanged( SCROW nStartRow, SCROW nEndRow );
boolUpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1,
SCROW nRow1, SCTAB nTab1,
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c7c09d8..31c5ac2 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -863,6 +863,18 @@
voidCompileAll();
voidCompileXML();
+/**
+ * Re-compile formula cells with error.
+ *
+ * @param nErrCode specified error code to match. Only those cells with
+ * this error code will be re-compiled. If this value is
+ * 0, cells with any error values will be re-compiled.
+ *
+ * @return true if at least one cell is re-compiled, false if no cells are
+ * re-compiled.
+ */
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
ScAutoNameCache* GetAutoNameCache() { return pAutoNameCache; }
SC_DLLPUBLIC void SetAutoNameCache( ScAutoNameCache* pCache
);
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 26d5a69..061c830 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -446,6 +446,8 @@
voidCompileAll();
voidCompileXML( ScProgress rProgress );
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
voidUpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1,
SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 462abe7..7bdb927 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2149,6 +2149,41 @@
}
}
+bool ScColumn::CompileErrorCells(sal_uInt16 nErrCode)
+{
+if (maItems.empty())
+return false;
+
+bool bCompiled = false;
+std::vectorColEntry::iterator it = maItems.begin(), itEnd =
maItems.end();
+for (; it != itEnd; ++it)
+{
+ScBaseCell* pCell = it-pCell;
+if (pCell-GetCellType() != CELLTYPE_FORMULA)
+// Not a formula cell. Skip it.
+continue;
+
+ScFormulaCell* pFCell = static_castScFormulaCell*(pCell);
+sal_uInt16 nCurError = pFCell-GetRawError();
+if (!nCurError)
+// It's not an error cell. Skip it.
+continue;
+
+if (nErrCode nCurError != nErrCode)
+// Error code is specified, and it doesn't match. Skip it.
+continue;
+
+pFCell-GetCode()-SetCodeError(0);
+pFCell-SetCompile(true);
+OUStringBuffer aBuf;
+pFCell-GetFormula(aBuf, pDocument-GetGrammar());
+pFCell-Compile(aBuf.makeStringAndClear(), false,
pDocument-GetGrammar());
+
+bCompiled = true;
+}
+
+return bCompiled;
+}
void ScColumn::CalcAfterLoad()
{
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 95018d7..8cc1713 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3377,6 +3377,22 @@
SetAutoCalc( bOldAutoCalc );
}
+bool ScDocument::CompileErrorCells(sal_uInt16 nErrCode)
+{
+bool bCompiled = false;
+TableContainer::iterator it = maTabs.begin(), itEnd = maTabs.end();
+for (; it != itEnd; ++it)
+{
+ScTable* pTab = *it;
+if (!pTab)
+continue;
+
+if (pTab-CompileErrorCells(nErrCode))
+bCompiled = true;
+}
+
+return bCompiled;
+}
void ScDocument::CalcAfterLoad()
{
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index f0bd119..918a602 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1539,6 +1539,18 @@
mpCondFormatList-CompileXML();
}
+bool ScTable::CompileErrorCells(sal_uInt16 nErrCode)
+{
+bool bCompiled = false;
+for
Change in core[libreoffice-4-0]: bnc#615357: Recompile cells with #NAME! for English function...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1931 Approvals: Markus Mohrhard: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1931 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id340ce9b5db3ed368b98e814861be5c3f96df071 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Use a method from UnoApitest instead of implement a new one ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1923 -- To view, visit https://gerrit.libreoffice.org/1923 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic02f13777503729ac70da590f4a42866f17ea9b2 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: bnc#492440: Sort autofilter popup items correctly.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1932
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/1932/1
bnc#492440: Sort autofilter popup items correctly.
Use locale-aware collator to sort strings, instead of using the
transliterator. The actual sorting algorithm for cell sort uses
collator. Let's be consistent with it.
Change-Id: I6729553ce92d50e45fa1ea6e1c35581fd791807d
---
M sc/source/core/tool/typedstrdata.cxx
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sc/source/core/tool/typedstrdata.cxx
b/sc/source/core/tool/typedstrdata.cxx
index 811c5d8..71cf0fa 100644
--- a/sc/source/core/tool/typedstrdata.cxx
+++ b/sc/source/core/tool/typedstrdata.cxx
@@ -29,7 +29,7 @@
#include typedstrdata.hxx
#include global.hxx
-#include unotools/transliterationwrapper.hxx
+#include unotools/collatorwrapper.hxx
bool ScTypedStrData::LessCaseSensitive::operator() (const ScTypedStrData
left, const ScTypedStrData right) const
{
@@ -39,7 +39,7 @@
if (left.meStrType == Value)
return left.mfValue right.mfValue;
-return ScGlobal::GetCaseTransliteration()-compareString(
+return ScGlobal::GetCaseCollator()-compareString(
left.maStrValue, right.maStrValue) 0;
}
@@ -51,7 +51,7 @@
if (left.meStrType == Value)
return left.mfValue right.mfValue;
-return ScGlobal::GetpTransliteration()-compareString(
+return ScGlobal::GetCollator()-compareString(
left.maStrValue, right.maStrValue) 0;
}
@@ -63,7 +63,7 @@
if (left.meStrType == Value left.mfValue != right.mfValue)
return false;
-return ScGlobal::GetCaseTransliteration()-compareString(
+return ScGlobal::GetCaseCollator()-compareString(
left.maStrValue, right.maStrValue) == 0;
}
@@ -75,7 +75,7 @@
if (left.meStrType == Value left.mfValue != right.mfValue)
return false;
-return ScGlobal::GetpTransliteration()-compareString(
+return ScGlobal::GetCollator()-compareString(
left.maStrValue, right.maStrValue) == 0;
}
--
To view, visit https://gerrit.libreoffice.org/1932
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6729553ce92d50e45fa1ea6e1c35581fd791807d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-qa] Designed image
Hello, Recently I have designed an image with LibreOffice, and I could not export it decently to an image format file. It looses a lot of quality, even running Impress presentation. The maximum quality that I obtained saving this image was exporting it as PDF. I hope it would be a problem solved in the new LibreOffice 4.0. Thank you very much in advance, Álvaro P.S.: I have attached the file. Logo.odp Description: application/vnd.oasis.opendocument.presentation ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [ANNOUNCE] libreoffice-4.0.0.3 tag created
Hi,
there have been created the tag libreoffice-4.0.0.3, aka rc3. The
corresponding official builds will be available within next few days.
It will be used as final if no blocker is found.
See the attached list of changes against 4.0.0.2.
Now, you might switch your current 4-0 source tree to it using:
./g fetch --tags
./g checkout -b tag-libreoffice-4.0.0.3 libreoffice-4.0.0.3
Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will be available from the official page together with the builds.
See also the schedule at
http://wiki.documentfoundation.org/ReleasePlan#4.0_release
and release criteria at http://wiki.documentfoundation.org/Release_Criteria
Best Regards,
Petr
bnc#798271 Charts are not visible after save [Kohei Yoshida]
fdo#57061 No personal data imported (or moved) during install from /3 User Profile [Stephan Bergmann]
fdo#58562 EDITING: copy and paste of CHART from Calc looses Y values [Kohei Yoshida]
fdo#59056 Charts are moved between sheets when saving a spreadsheet created with 3.6 [Kohei Yoshida]
fdo#59193 automatic row height does not work after import [Markus Mohrhard]
fdo#59325 Buttons disappeared in calc [Noel Power]
fdo#59422 [LOCALIZATION] Personas Dialog shows pt-PT strings in pt-BR locale. [Caolán McNamara]
fdo#59586 EDITING: Missing comma in particular PDF file (regression) [Caolán McNamara]
fdo#59724 FILEOPEN: Inherited currency format not retained through close and open [Markus Mohrhard]
fdo#59728 Python 3 loads utf-8 encoded files as CP-1252 encoded files [Stephan Bergmann]
fdo#59779 Double click on page style name in Styles and Formatting does not work [Cédric Bosdonnat]
fdo#59798 CONFIGURATION: Wrong Version info 4.0 .0.2 [Michael Stahl]
fdo#59819 FILESAVE: .xlsx: new functions (AVERAGEIF,AVERAGEIFS,COUNTIFS,SUMIFS,IFERROR,IFNA) lead to warning in Excel 2013, and IFNA is not accepted [Eike Rathke]
fdo#59881 sdremote - deadlock ... [Michael Meeks]
fdo#59931 Crash when starting wizard if icons set has been changed [Arnaud Versini]
fdo#59965 UI: program crash dialog looks unfinished [Caolán McNamara]
fdo#59969 Clear screen during Logo program execution can crash LibreOffice [László Németh]
* {{bnc|798271}} Charts are not visible after save [Kohei Yoshida]
* {{fdo|57061}} No personal data imported (or moved) during install from /3
User Profile [Stephan Bergmann]
* {{fdo|58562}} EDITING: copy and paste of CHART from Calc looses Y values
[Kohei Yoshida]
* {{fdo|59056}} Charts are moved between sheets when saving a spreadsheet
created with 3.6 [Kohei Yoshida]
* {{fdo|59193}} automatic row height does not work after import [Markus
Mohrhard]
* {{fdo|59325}} Buttons disappeared in calc [Noel Power]
* {{fdo|59422}} [LOCALIZATION] Personas Dialog shows pt-PT strings in pt-BR
locale. [Caolán McNamara]
* {{fdo|59586}} EDITING: Missing comma in particular PDF file (regression)
[Caolán McNamara]
* {{fdo|59724}} FILEOPEN: Inherited currency format not retained through close
and open [Markus Mohrhard]
* {{fdo|59728}} Python 3 loads utf-8 encoded files as CP-1252 encoded files
[Stephan Bergmann]
* {{fdo|59779}} Double click on page style name in Styles and Formatting does
not work [Cédric Bosdonnat]
* {{fdo|59798}} CONFIGURATION: Wrong Version info 4.0 .0.2 [Michael Stahl]
* {{fdo|59819}} FILESAVE: .xlsx: new functions
(AVERAGEIF,AVERAGEIFS,COUNTIFS,SUMIFS,IFERROR,IFNA) lead to warning in Excel
2013, and IFNA is not accepted [Eike Rathke]
* {{fdo|59881}} sdremote - deadlock ... [Michael Meeks]
* {{fdo|59931}} Crash when starting wizard if icons set has been changed
[Arnaud Versini]
* {{fdo|59965}} UI: program crash dialog looks unfinished [Caolán McNamara]
* {{fdo|59969}} Clear screen during Logo program execution can crash
LibreOffice [László Németh]
+ common
+ version 4.0.0.3, tag libreoffice-4.0.0.3 [Petr Mladek]
+ core
+ add link to additional sdk-examples [Stephan Bergmann]
+ class vs struct mismatch [Luboš Luňák]
+ crash dialog title area text is missing (fdo#59965) [Caolán McNamara]
+ crash fix (insecure clear screen during Logo execution) (fdo#59969) [László Németh]
+ do not call putenv with a temporary string argument [Stephan Bergmann]
+ don't delete the PropertyMapEntry instance prematurely. (bnc#798271) [Kohei Yoshida]
+ don't use ScDrawLayer::GetObjDataTab to get Anchor fix for (fdo#59325) [Noel Power]
+ ensure internal data is always used when pasting to another doc. (fdo#58562) [Kohei Yoshida]
+ fix encoding of .py files as UTF-8 for Python 3 (fdo#59728) [Stephan Bergmann]
+ fix SDK MSI version LOdev 4.1 SDK.0.0.alpha0 (fdo#59798) [Michael Stahl]
+ if loading a ll-TT trans succeeds, don't fallback to ll (fdo#59422) [Caolán McNamara]
+ import inherited number formats with cached values, (fdo#59724) [Markus Mohrhard]
+ lo-pack-sources: run NOCONFIGURE=1 ./autogen.sh instead of autoreconf [Petr Mladek]
+ missing comma in particular PDF file
[Libreoffice-qa] FDO BSA Administration Info - New version 4.0.0.3 rc
Version 4.0.0.3 rc has been added to FreeDesktop.Org and will be added shortly to BSA. Best Regards, Joel -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.com ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] requesting input for preparing FOSDEM QA-presentation
Hi guys 'n girls, Next Sunday at FOSDEM I'll be giving the beginners talk to successful participating in LibreOffice QA - or something similar. As will be noticed, I'm mostly absent here (due to other obligations), so it may well be that I've missed important developments, that I should know when having the talk. Of course I'll try to look over meeting-reports, will look at the wiki if there's any new, know there's an improved BSA and have seen something about a policy around NEEDINFO-bugs... But then still... is there something that you think I should not miss, please let me know! Thanks a lot, Cor -- - Cor - http://nl.libreoffice.org - www.librelex.org ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
