[Libreoffice-commits] .: 7 commits - dbaccess/uiconfig

[Jan Holesovsky]

 dbaccess/uiconfig/dbtdata/menubar/menubar.xml |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 65ef0f630fef7af092cc990297b8007632a60dca
Merge: 76083e2... 7351e5d...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Feb 8 00:02:34 2011 +0100

    Merge remote branch 'origin/libreoffice-3-3'

commit 7351e5dc8e24e51af5af5c17798f26e00626711c
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sat Jan 15 05:39:40 2011 +0100

    i#116187: report left/right page margin setting ignored on Unix 64 bit
    (cherry picked from commit 51a9333217687ff16df40ea3bd8983faaf5e425a)

diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index eeb35f2..473e3b3 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2526,8 +2526,8 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
 
                     if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_LRSPACE,sal_True,&pItem))
                     {
-                        xProp->setPropertyValue(PROPERTY_LEFTMARGIN,uno::makeAny(static_cast<const SvxLRSpaceItem*>(pItem)->GetLeft()));
-                        xProp->setPropertyValue(PROPERTY_RIGHTMARGIN,uno::makeAny(static_cast<const SvxLRSpaceItem*>(pItem)->GetRight()));
+                        xProp->setPropertyValue(PROPERTY_LEFTMARGIN,uno::makeAny((sal_Int32)static_cast<const SvxLRSpaceItem*>(pItem)->GetLeft()));
+                        xProp->setPropertyValue(PROPERTY_RIGHTMARGIN,uno::makeAny((sal_Int32)static_cast<const SvxLRSpaceItem*>(pItem)->GetRight()));
                     }
                     if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_ULSPACE,sal_True,&pItem))
                     {
commit aa3b692805e5581d6f770f5a59b3563423dd3f9d
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Jan 14 11:24:43 2011 -0500

    Remove the Registration... menu item which we don't want. (fdo#33112)

diff --git a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
index d1beb43..79fe68a 100644
--- a/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
+++ b/dbaccess/uiconfig/dbtdata/menubar/menubar.xml
@@ -67,7 +67,6 @@
             <menu:menuitem menu:id=".uno:ExtendedHelp"/>
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowLicense"/>
-            <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/>
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:ShowCredits"/>
             <menu:menuitem menu:id=".uno:About"/>
commit e97e6fd2a34584fbf1c974e6663f7e2b06a83d49
Author: Noel Power <noel.power at novell.com>
Date:   Wed Jan 12 11:09:51 2011 +0000

    fix for fdo#32742#

diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index e3610c4..bc866d9 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -173,7 +173,7 @@ namespace rptui
         };
 
         s_pPropertyInfos = aPropertyInfos;
-
+        s_nCount = SAL_N_ELEMENTS(aPropertyInfos);
         ::std::sort( aPropertyInfos, aPropertyInfos + SAL_N_ELEMENTS(aPropertyInfos), PropertyInfoLessByName() );
 
         return s_pPropertyInfos;
commit 9673a66350edf8bdb3a9af74df7eb3ed0cd7042f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jan 11 23:05:56 2011 +0100

    Please, ignore the previous message; it was for the libreoffice-3-3-0 branch
    
    This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases.
    Only safe changes, reviewed by anoter person are allowed.
    
    If you want to build something cool, unstable, and risky, use master.
commit 8f7887da80732abf15538fe4efe8571ad32e8715
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jan 11 22:39:06 2011 +0100

    Branch libreoffice-3-3-0
    
    This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
    Only very safe changes, reviewed by three people are allowed.
    
    If you want to commit more complicated fix for the next 3.3.x release,
    please use the 'libreoffice-3-3' branch.
    
    If you want to build something cool, unstable, and risky, use master.
commit a175c9433c60391a911ad595c510b3831335980b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jan 10 19:47:07 2011 +0100

    Version 3.3.0.3, tag libreoffice-3.3.0.3 (3.3-rc3)