[Libreoffice-commits] .: 2 commits - cui/source solenv/gbuild

[Kohei Yoshida]

 cui/source/dialogs/pastedlg.cxx |    3 +--
 cui/source/inc/pastedlg.hxx     |    2 --
 solenv/gbuild/BuildDirs.mk      |    9 +++++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

New commits:
commit f077db2668fe12eb260a47ac9abf5db32eeeab15
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Thu Dec 1 01:28:39 2011 -0500

    Revert "Don't overwrite OUTDIR & friends."
    
    This reverts commit 28275d470f3a062cfa27d72bbf89328af1e83c68.

diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index 828546f..6a0933b 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -35,6 +35,15 @@ ifeq ($(strip $(SOLARENV)),)
 $(error SOLARENV variable is empty, no environment set, aborting)
 endif
 
+# HACK
+# unixify windoze paths
+ifeq ($(OS_FOR_BUILD),WNT)
+override WORKDIR := $(shell cygpath -u $(WORKDIR))
+override OUTDIR := $(shell cygpath -u $(OUTDIR))
+override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD))
+override SRCDIR := $(shell cygpath -u $(SRCDIR))
+endif
+
 REPODIR := $(patsubst %/,%,$(dir $(SRCDIR)))
 
 # vim: set noet sw=4:
commit f41eddb61c76d4bce924dd5fcddd21157a83d4eb
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Thu Dec 1 00:07:47 2011 -0500

    This data member is no longer used. Remove it.

diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 3d03466..47fdf2f 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -58,8 +58,7 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent )
     aLbInsertList( this, CUI_RES( LB_INSERT_LIST ) ),
     aOKButton1( this, CUI_RES( 1 ) ),
     aCancelButton1( this, CUI_RES( 1 ) ),
-    aHelpButton1( this, CUI_RES( 1 ) ),
-    aSObject( CUI_RES( S_OBJECT ) )
+    aHelpButton1( this, CUI_RES( 1 ) )
 {
     FreeResource();
     SetHelpId( HID_PASTE_DLG );
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index 1e27ce9..93c6ff4 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -60,7 +60,6 @@ class SvPasteObjectDialog : public ModalDialog
     OKButton aOKButton1;
     CancelButton aCancelButton1;
     HelpButton aHelpButton1;
-    String aSObject;
     Table           aSupplementTable;
     SvGlobalName    aObjClassName;
     String          aObjName;
@@ -72,7 +71,6 @@ class SvPasteObjectDialog : public ModalDialog
     RadioButton&    PasteLink()     { return aRbPasteLink; }
     CheckBox&       AsIconBox()     { return aCbDisplayAsIcon; }
 
-    const String&   GetObjString()  { return aSObject; }
     void            SelectObject();
     DECL_LINK( SelectHdl, ListBox * );
     DECL_LINK( DoubleClickHdl, ListBox * );