Commits

Anonymous committed 6feb142

hsqldb19: build problems with new m105 and merge conflict

Comments (0)

Files changed (6)

connectivity/source/drivers/hsqldb/HDriver.cxx

 	using namespace ::com::sun::star::lang;
 	using namespace ::com::sun::star::embed;
     using namespace ::com::sun::star::io;
+	using namespace ::com::sun::star::util;
     using namespace ::com::sun::star::task;
 	using namespace ::com::sun::star::reflection;
 

dbaccess/source/ui/control/FieldDescControl.cxx

 	}
 
 	// jetzt kann ich sie wirklich positionieren und ihre Parameter setzen
+	m_nOldVThumb = 0;
 	if (bNeedVScrollBar)
 	{
 		m_pVertScroll->Show();
 		m_pVertScroll->SetPosSizePixel( Point(nNewHWidth, 0), Size(nVScrollWidth, szOverallSize.Height()) );
 	}
 	else
-	{
-        m_nOldVThumb = 0;
+	{   
 		m_pVertScroll->Hide();
 		m_pVertScroll->SetRangeMax(0);
 		m_pVertScroll->SetThumbPos(0);

gdk-pixbuf/gdk-pixbuf-2.23.0-win32.patch

 @@ -1,9 +1,19 @@
 -TOP = ..\..
  PRJ_TOP = ..
-+GLIB_TOP = $(PRJ_TOP)\..\..\..\..\..\glib\wntmsci12.pro\misc\build\glib-2.28.1
++GLIB_TOP = $(PRJ_TOP)\..\..\..\..\..\glib\$(OUTPATH)$(PROEXT)\misc\build\glib-2.28.1
  PACKAGE = gdk_pixbuf
  PKG_VER = $(GDK_PIXBUF_VER)
 +GLIB_INC = -I$(OUTDIR)\inc\external\glib-2.0
 -PACKAGE = pixops
  PRJ_TOP = ..\..
 +PACKAGE = pixops
-+GLIB_TOP = $(PRJ_TOP)\..\..\..\..\..\glib\wntmsci12.pro\misc\build\glib-2.28.1
++GLIB_TOP = $(PRJ_TOP)\..\..\..\..\..\glib\$(OUTPATH)$(PROEXT)\misc\build\glib-2.28.1
 +GLIB_INC = -I$(OUTDIR)\inc\external\glib-2.0
  
 -!INCLUDE $(TOP)/glib/build/win32/make.msc

svtools/source/filter/jpeg/jpegc.c

 #include <stdio.h>
 #include <stdlib.h>
 #include "setjmp.h"
-#include "jpeglib.h"
-#include "jerror.h"
+#include "jpeg/jpeglib.h"
+#include "jpeg/jerror.h"
 #include "jpeg.h"
 #include "rtl/alloc.h"
 #include "osl/diagnose.h"

wizards/com/sun/star/wizards/db/TableDescriptor.java

         {
             // XTablesSupplier xDBTables = (XTablesSupplier) UnoRuntime.queryInterface(XTablesSupplier.class, DBConnection);
             // xTableNames = xDBTables.getTables();
-            xTableAppend = UnoRuntime.queryInterface( XAppend.class, getTableNamesAsNameAccess() );
-            xTableDrop = UnoRuntime.queryInterface( XDrop.class, getTableNamesAsNameAccess() );
-            xTableDataDescriptorFactory = UnoRuntime.queryInterface( XDataDescriptorFactory.class, getTableNamesAsNameAccess() );
+            xTableAppend = UnoRuntime.queryInterface(XAppend.class, getTableNamesAsNameAccess());
+            xTableDrop = UnoRuntime.queryInterface(XDrop.class, getTableNamesAsNameAccess());
+            xTableDataDescriptorFactory = UnoRuntime.queryInterface(XDataDescriptorFactory.class, getTableNamesAsNameAccess());
             xPropTableDataDescriptor = xTableDataDescriptorFactory.createDataDescriptor();
-            XColumnsSupplier xColumnsSupplier = UnoRuntime.queryInterface( XColumnsSupplier.class, xPropTableDataDescriptor );
+            XColumnsSupplier xColumnsSupplier = UnoRuntime.queryInterface(XColumnsSupplier.class, xPropTableDataDescriptor);
             xNameAccessColumns = xColumnsSupplier.getColumns();
-            xColumnDataDescriptorFactory = UnoRuntime.queryInterface( XDataDescriptorFactory.class, xNameAccessColumns );
+            xColumnDataDescriptorFactory = UnoRuntime.queryInterface(XDataDescriptorFactory.class, xNameAccessColumns);
             try
             {
                 createTypeInspector();
                 if (!isColunnNameDuplicate(xNameAccessColumns, xColPropertySet))
                 {
                     xAppendColumns.appendByDescriptor(xColPropertySet);	//xColPropertySet.setPropertyValue("Type", 32423)
-                        }
-                        else
-                        {
+                }
+                else
+                {
                     breturn = false;
                 }
             }
                 ColumnDescriptor oColumnDescriptor = columncontainer.get(i);
                 if (oColumnDescriptor.Name.equals(_sname))
                 {
-                    ColumnDescriptor oColumnDescriptor = (ColumnDescriptor) columncontainer.get(i);
-                    if (oColumnDescriptor.Name.equals(_sname))
+                    oColumnDescriptor.xColPropertySet.setPropertyValue(_spropname, _oValue);
+                    if (_spropname.equals(PropertyNames.PROPERTY_NAME))
                     {
-                        oColumnDescriptor.xColPropertySet.setPropertyValue(_spropname, _oValue);
-                        if (_spropname.equals(PropertyNames.PROPERTY_NAME))
-                        {
-                            oColumnDescriptor.Name = (String) _oValue;
-                        }
-                        columncontainer.remove(i);
-                        columncontainer.insertElementAt(oColumnDescriptor, i);
-                        return true;
+                        oColumnDescriptor.Name = (String) _oValue;
                     }
+                    columncontainer.remove(i);
+                    columncontainer.add(i, oColumnDescriptor);
+                    return true;
                 }
             }
         }

wizards/com/sun/star/wizards/table/FieldFormatter.java

 import com.sun.star.awt.XItemListener;
 import com.sun.star.awt.XListBox;
 import com.sun.star.awt.XTextComponent;
+import com.sun.star.beans.PropertyChangeEvent;
+import com.sun.star.beans.UnknownPropertyException;
+import com.sun.star.beans.XPropertyChangeListener;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.EventObject;
+import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.uno.Exception;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.wizards.common.Desktop;
 import com.sun.star.wizards.db.TableDescriptor;
 import com.sun.star.wizards.ui.UIConsts;
 import com.sun.star.wizards.ui.UnoDialog;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
-public class FieldFormatter implements XItemListener
+public class FieldFormatter implements XItemListener, XPropertyChangeListener
 {
 
+    private static final String COLUMN = "Column";
     TableWizard CurUnoDialog;
     TableDescriptor curTableDescriptor;
     Object oColumnDescriptorModel;
         this.CurUnoDialog = _CurUnoDialog;
         curtabindex = (short) (TableWizard.SOFIELDSFORMATPAGE * 100);
         IFieldFormatStep = new Integer(TableWizard.SOFIELDSFORMATPAGE);
-		String sFieldName = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 23);
+        String sFieldName = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 23);
         String sFieldNames = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 25);
         String sfieldinfo = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 20);
         String sbtnplushelptext = CurUnoDialog.m_oResource.getResText(UIConsts.RID_TABLE + 45);
 
     public boolean updateColumnofColumnDescriptor()
     {
-        return true;
+        Object oColumn = Helper.getUnoPropertyValue(oColumnDescriptorModel, COLUMN);
+        XPropertySet xColPropertySet = UnoRuntime.queryInterface(XPropertySet.class, oColumn);
+        if (xColPropertySet != null)
+        {
+            try
+            {
+                curTableDescriptor.modifyColumn((String) xColPropertySet.getPropertyValue(PropertyNames.PROPERTY_NAME), xColPropertySet);
+            }
+            catch (UnknownPropertyException ex)
+            {
+                Logger.getLogger(FieldFormatter.class.getName()).log(Level.SEVERE, null, ex);
+            }
+            catch (WrappedTargetException ex)
+            {
+                Logger.getLogger(FieldFormatter.class.getName()).log(Level.SEVERE, null, ex);
+            }
+            return true;
+        }
+        return false;
     }
 
     private void updateColumnDescriptor(String _ColumnName, XPropertySet _xColumn)
         XPropertySet xNewPropertySet = curTableDescriptor.clonePropertySet(_ColumnName, _xColumn);
         if (xNewPropertySet != null)
         {
-            Helper.setUnoPropertyValue(oColumnDescriptorModel, "Column", xNewPropertySet);
+            try
+            {
+                xNewPropertySet.addPropertyChangeListener(PropertyNames.PROPERTY_NAME, this);
+            }
+            catch (UnknownPropertyException ex)
+            {
+                Logger.getLogger(FieldFormatter.class.getName()).log(Level.SEVERE, null, ex);
+            }
+            catch (WrappedTargetException ex)
+            {
+                Logger.getLogger(FieldFormatter.class.getName()).log(Level.SEVERE, null, ex);
+            }
+            Helper.setUnoPropertyValue(oColumnDescriptorModel, COLUMN, xNewPropertySet);
         }
     }
 
     {
         // TODO Auto-generated method stub
     }
+
+    public void propertyChange(PropertyChangeEvent pce)
+    {
+        String newfieldname = (String) pce.NewValue;
+        String oldfieldname = xlstFieldNames.getSelectedItem();
+        if (!newfieldname.equals(oldfieldname) && curTableDescriptor.modifyColumnName(oldfieldname, newfieldname))
+        {
+            FieldDescription curfielddescription = (FieldDescription) CurUnoDialog.fielditems.get(oldfieldname);
+            CurUnoDialog.fielditems.remove(oldfieldname);
+            curfielddescription.setName(newfieldname);
+            CurUnoDialog.fielditems.put(newfieldname, curfielddescription);
+            String[] currentFieldNames = xlstFieldNames.getItems();
+            short ipos = xlstFieldNames.getSelectedItemPos();
+            currentFieldNames[ipos] = newfieldname;
+            Helper.setUnoPropertyValue(UnoDialog.getModel(xlstFieldNames), PropertyNames.STRING_ITEM_LIST, currentFieldNames);
+            Helper.setUnoPropertyValue(UnoDialog.getModel(xlstFieldNames), PropertyNames.SELECTED_ITEMS, new short[]
+                    {
+                        ipos
+                    });
+        }
+    }
 }