[Libreoffice-commits] .: dbaccess/source

Caolán McNamara caolan at kemper.freedesktop.org
Fri Jan 21 07:17:52 PST 2011


 dbaccess/source/ui/querydesign/JoinController.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit cd83a62442883e9fc7fc3b489af7e9c7ff06b97c
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Jan 21 07:48:14 2011 +0100

    Fix property type / default value mismatch
    
    Fixes:
     Error: caught an exception
     message: Invalid value type for 'WindowTop'.
     Expected: long
     Found: hyper
      From File dbaccess/source/ui/querydesign/querycontroller.cxx at Line 1722
    when editing a query

diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 77b31a8..cbd19e5 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -444,10 +444,10 @@ void OJoinController::saveTableWindows( ::comphelper::NamedValueCollection& o_rV
             aWindowData.put( "ComposedName", (*aIter)->GetComposedName() );
             aWindowData.put( "TableName", (*aIter)->GetTableName() );
             aWindowData.put( "WindowName", (*aIter)->GetWinName() );
-            aWindowData.put( "WindowTop", (*aIter)->GetPosition().Y() );
-            aWindowData.put( "WindowLeft", (*aIter)->GetPosition().X() );
-            aWindowData.put( "WindowWidth", (*aIter)->GetSize().Width() );
-            aWindowData.put( "WindowHeight", (*aIter)->GetSize().Height() );
+            aWindowData.put( "WindowTop", static_cast<sal_Int32>(*aIter)->GetPosition().Y() );
+            aWindowData.put( "WindowLeft", static_cast<sal_Int32>(*aIter)->GetPosition().X() );
+            aWindowData.put( "WindowWidth", static_cast<sal_Int32>(*aIter)->GetSize().Width() );
+            aWindowData.put( "WindowHeight", static_cast<sal_Int32>(*aIter)->GetSize().Height() );
             aWindowData.put( "ShowAll", (*aIter)->IsShowAll() );
 
             const ::rtl::OUString sTableName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Table" ) ) + ::rtl::OUString::valueOf( i ) );


More information about the Libreoffice-commits mailing list