ooo-build r12722 - in trunk: . patches/dev300
- From: jannieuw svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r12722 - in trunk: . patches/dev300
- Date: Fri, 30 May 2008 10:48:31 +0000 (UTC)
Author: jannieuw
Date: Fri May 30 10:48:31 2008
New Revision: 12722
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12722&view=rev
Log:
2008-05-30 Jan Nieuwenhuizen <janneke gnu org>
* patches/dev300/layout-tab-toolkit-localize.diff: New file.
* patches/dev300/apply: Add it.
* patches/dev300/layout-tab-toolkit.diff: Update localization.
Added:
trunk/patches/dev300/layout-tab-toolkit-localize.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/layout-tab-toolkit.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Fri May 30 10:48:31 2008
@@ -1899,6 +1899,8 @@
[ LocalizeLayout ]
cws-layoutdialogs-toolkit-localize.diff
+layout-tab-toolkit-localize.diff
+
[ AutoCorrectCapsLock ]
SectionOwner => kohei
Added: trunk/patches/dev300/layout-tab-toolkit-localize.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/layout-tab-toolkit-localize.diff Fri May 30 10:48:31 2008
@@ -0,0 +1,68 @@
+diff --git a/workben/layout/localize.sdf b/workben/layout/localize.sdf
+index 61a3e51..8c60a67 100644
+--- toolkit/workben/layout/localize.sdf
++++ toolkit/workben/layout/localize.sdf
+@@ -1050,3 +1050,63 @@ layout janneke\vc\layout-cws\toolkit\workben\layout\zoom.xml 0 layout BTN_WHOLE_
+ layout janneke\vc\layout-cws\toolkit\workben\layout\zoom.xml 0 layout BTN_WHOLE_PAGE_label 0 zh-CN æé(~E) 2002-02-02 02:02:02
+ layout janneke\vc\layout-cws\toolkit\workben\layout\zoom.xml 0 layout BTN_WHOLE_PAGE_label 0 zh-TW æé(~E) 2002-02-02 02:02:02
+ layout janneke\vc\layout-cws\toolkit\workben\layout\zoom.xml 0 layout BTN_WHOLE_PAGE_label 0 zu Ikhasi ~lonke 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout STR_COL_LABEL_text 0 en-US Range contains column la~bels 20080528 15:28:37
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout STR_ROW_LABEL_text 0 en-US Range contains ~row labels 20080528 15:28:37
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout XSCSTR_UNDEFINED_text 0 en-US - undefined - 20080528 15:28:37
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_CASESENSITIVE_label 0 en-US Case ~sensitive 20080528 15:28:37
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_FORMATS_label 0 en-US Include ~formats 20080528 15:28:37
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_NATURALSORT_label 0 en-US Enable ~natural sort 20080528 15:28:37
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_COPYRESULT_label 0 en-US ~Copy sort results to: 20080528 15:28:37
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_SORT_USER_label 0 en-US Custom sort ~order 20080528 15:28:37
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FT_LANGUAGE_label 0 en-US ~Language 20080528 15:28:37
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FT_ALGORITHM_label 0 en-US O~ptions 20080528 15:28:37
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_TOP_DOWN_label 0 en-US ~Top to bottom (sort rows) 20080528 15:28:37
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_LEFT_RIGHT_label 0 en-US L~eft to right (sort columns) 20080528 15:28:37
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_CASESENSITIVE_label 0 de ~GroÃ-/Kleinschreibung 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_CASESENSITIVE_label 0 nl ~Hoofdletters/kleine letters 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_COPYRESULT_label 0 de Sortierergebnis ~ausgeben nach 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_COPYRESULT_label 0 nl ~Sorteerresultaten kopiÃren naar: 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_FORMATS_label 0 de ~Formate einschlieÃen 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_FORMATS_label 0 nl ~Opmaak opnemen 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_SORT_USER_label 0 de ~Benutzerdefinierte Sortierreihenfolge 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_SORT_USER_label 0 nl ~Door gebruiker gedefinieerde sorteervolgorde 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FL_SORT1_text 0 de ~Sortieren nach 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FL_SORT1_text 0 nl ~Sorteren op 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FL_SORT2_text 0 de ~AnschlieÃend nach 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FL_SORT2_text 0 nl ~Daarna op 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FL_SORT3_text 0 de A~nschlieÃend nach 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FL_SORT3_text 0 nl D~aarna op 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FL_DIRECTION_text 0 de Richtung 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FL_DIRECTION_text 0 nl Richting 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FT_ALGORITHM_label 0 de Op~tionen 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FT_ALGORITHM_label 0 nl O~pties 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FT_AREA_LABEL_label 0 de Datenbereich: 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FT_AREA_LABEL_label 0 nl Gegevensbereik: 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FT_LANGUAGE_label 0 de S~prache 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout FT_LANGUAGE_label 0 nl ~Taal 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout TP_FIELDS_label 0 de Sortierkriterien 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout TP_FIELDS_label 0 nl Sorteercriteria 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout TP_OPTIONS_label 0 de Optionen 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout TP_OPTIONS_label 0 nl Opties 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_DOWN1_label 0 de A~bsteigend 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_DOWN1_label 0 nl A~flopend 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_DOWN2_label 0 de Abstei~gend 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_DOWN2_label 0 nl Aflo~pend 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_DOWN3_label 0 de Absteigen~d 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_DOWN3_label 0 nl Aflopen~d 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_UP1_label 0 de A~ufsteigend 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_UP1_label 0 nl Op~lopend 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_UP2_label 0 de Au~fsteigend 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_UP2_label 0 nl Oplope~nd 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_UP3_label 0 de Aufs~teigend 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_UP3_label 0 nl ~Oplopend 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_LEFT_RIGHT_label 0 de Von ~links nach rechts (Spalten sortieren) 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_LEFT_RIGHT_label 0 nl Van ~links naar rechts (kolommen sorteren) 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_TOP_DOWN_label 0 de Von ~oben nach unten (Zeilen sortieren) 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout BTN_TOP_DOWN_label 0 nl Van ~boven naar beneden (rijen sorteren) 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout STR_COL_LABEL_label 0 de Bereich ~enthÃlt Spaltenbeschriftungen 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout STR_COL_LABEL_label 0 nl Bereik bevat ~kolomkoppen 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout STR_ROW_LABEL_label 0 de Bereich ~enthÃlt Zeilenbeschriftungen 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout STR_ROW_LABEL_label 0 nl Bereik bevat ~rijkoppen 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout RID_SCDLG_SORT_title 0 de Sortieren 2002-02-02 02:02:02
++layout janneke\vc\layout-cws\toolkit\workben\layout\sort-options.xml 0 layout RID_SCDLG_SORT_title 0 nl Sorteren 2002-02-02 02:02:02
Modified: trunk/patches/dev300/layout-tab-toolkit.diff
==============================================================================
--- trunk/patches/dev300/layout-tab-toolkit.diff (original)
+++ trunk/patches/dev300/layout-tab-toolkit.diff Fri May 30 10:48:31 2008
@@ -386,10 +386,10 @@
DBG_CTOR( VCLXSplitter, NULL );
diff --git a/source/awt/vclxtabpage.cxx b/source/awt/vclxtabpage.cxx
new file mode 100644
-index 0000000..b21498b
+index 0000000..5f29d26
--- /dev/null
+++ toolkit/source/awt/vclxtabpage.cxx
-@@ -0,0 +1,116 @@
+@@ -0,0 +1,135 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -469,10 +469,29 @@
+ VCLXWindow::dispose();
+}
+
++void VCLXTabPage::ProcessWindowEvent( VclWindowEvent const& event )
++{
++ ::vos::OClearableGuard aGuard( GetMutex() );
++#if 0
++ //Bin::ProcessWindowEvent( event );
++ switch ( event.GetId() )
++ {
++ case VCLEVENT_WINDOW_RESIZE:
++ resizedCb();
++ default:
++ aGuard.clear();
++#endif
++ VCLXWindow::ProcessWindowEvent( event );
++#if 0
++ break;
++ }
++#endif
++}
++
+void SAL_CALL VCLXTabPage::allocateArea( awt::Rectangle const& rArea )
+ throw (uno::RuntimeException)
+{
-+ ::com::sun::star::awt::Size reqSize = Bin::getMinimumSize();
++ awt::Size reqSize = Bin::getMinimumSize();
+ reqSize.Height = getHeightForWidth( rArea.Width );
+
+ if ( !bRealized )
@@ -508,10 +527,10 @@
+} // namespace layoutimpl
diff --git a/source/awt/vclxtabpage.hxx b/source/awt/vclxtabpage.hxx
new file mode 100644
-index 0000000..17feb15
+index 0000000..0283a46
--- /dev/null
+++ toolkit/source/awt/vclxtabpage.hxx
-@@ -0,0 +1,80 @@
+@@ -0,0 +1,83 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -576,13 +595,16 @@
+ ~VCLXTabPage();
+
+ // XComponent
-+ void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
++ void SAL_CALL dispose() throw(css::uno::RuntimeException);
++
++ // VCLXWindow
++ void ProcessWindowEvent( VclWindowEvent const& event );
+
+ // ::com::sun::star::awt::XLayoutContainer
-+ virtual void SAL_CALL allocateArea( ::com::sun::star::awt::Rectangle const& rArea )
-+ throw (::com::sun::star::uno::RuntimeException);
-+ virtual ::com::sun::star::awt::Size SAL_CALL getMinimumSize()
-+ throw(::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL allocateArea( css::awt::Rectangle const& rArea )
++ throw (css::uno::RuntimeException);
++ virtual css::awt::Size SAL_CALL getMinimumSize()
++ throw(css::uno::RuntimeException);
+
+private:
+ VCLXTabPage( VCLXTabPage const & );
@@ -1528,7 +1550,7 @@
} // namespace layout
diff --git a/source/vclcompat/wrapper.cxx b/source/vclcompat/wrapper.cxx
-index 6188ac1..3cdcc3e 100644
+index 6188ac1..117ec7c 100644
--- toolkit/source/vclcompat/wrapper.cxx
+++ toolkit/source/vclcompat/wrapper.cxx
@@ -36,23 +36,34 @@
@@ -1751,7 +1773,7 @@
short Dialog::Execute()
{
if ( !getImpl().mxDialog.is() )
-@@ -391,13 +421,123 @@ void Dialog::EndDialog( long nResult )
+@@ -391,13 +421,145 @@ void Dialog::EndDialog( long nResult )
getImpl().mxDialog->endDialog( nResult );
}
@@ -1827,6 +1849,28 @@
+// GetTabPage()->EnableChildTransparentMode( true );
+// GetTabPage()->SetPaintTransparent( true );
+// getImpl().redraw();
++
++
++ awt::Size curSize = GetVCLXWindow()->getSize();
++
++ //CSTDIO
++ printf ("%s: curSize: %d, %d\n", __FUNCTION__, curSize.Width, curSize.Height );
++
++ ::Window *page = GetTabPage();
++ if (1)
++ {
++ page->EnableChildTransparentMode( true );
++ page->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
++ ////SetParentClipMode( PARENTCLIPMODE_CLIP );
++ page->SetPaintTransparent( true );
++ }
++ else
++ {
++ page->EnableChildTransparentMode( false );
++ page->SetParentClipMode( 0 );
++ page->SetPaintTransparent( false );
++ }
++
+}
+
+void TabPage::DeactivatePage()
@@ -1876,7 +1920,7 @@
class FixedLineImpl : public ControlImpl
{
public:
-@@ -407,8 +547,8 @@ public:
+@@ -407,8 +569,8 @@ public:
}
};
@@ -1887,7 +1931,7 @@
bool FixedLine::IsEnabled()
{
-@@ -433,10 +573,10 @@ public:
+@@ -433,10 +595,10 @@ public:
}
};
@@ -1901,7 +1945,7 @@
{
if ( !getImpl().mxFixedText.is() )
return;
-@@ -452,8 +592,8 @@ public:
+@@ -452,8 +614,8 @@ public:
}
};
@@ -1912,7 +1956,7 @@
class ProgressBarImpl : public ControlImpl
{
-@@ -494,8 +634,8 @@ public:
+@@ -494,8 +656,8 @@ public:
}
};
@@ -1923,7 +1967,7 @@
void FixedImage::setImage( ::Image const& i )
{
-@@ -521,7 +661,7 @@ FixedImage::~FixedImage()
+@@ -521,7 +683,7 @@ FixedImage::~FixedImage()
#endif
@@ -1932,7 +1976,7 @@
#if 0
ProgressBar::ProgressBar( Context *pCtx, const char *pId, sal_uInt32 nId )
: Control( new ProgressBarImpl( pCtx, pCtx->GetPeerHandle( pId, nId ), this ) )
-@@ -534,7 +674,7 @@ ProgressBar::ProgressBar( Window *pParent, WinBits nBits)
+@@ -534,7 +696,7 @@ ProgressBar::ProgressBar( Window *pParent, WinBits nBits)
}
#endif
@@ -1941,13 +1985,13 @@
void ProgressBar::SetForegroundColor( css::util::Color color )
-@@ -601,7 +741,46 @@ Plugin::Plugin( Context *pCtx, char const *pId, ::Control *plugin )
+@@ -601,7 +763,46 @@ Plugin::Plugin( Context *pCtx, char const *pId, ::Control *plugin )
{
}
-DECL_GET_IMPL_IMPL( Plugin )
+IMPL_GET_IMPL( Plugin );
-+
+
+class LocalizedStringImpl : public WindowImpl
+{
+public:
@@ -1981,7 +2025,7 @@
+{
+ return getImpl().getText();
+}
-
++
+String LocalizedString::operator= (String const& s)
+{
+ getImpl().setText( s );
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
