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

[Andras Timar]

 sd/source/ui/dlg/dlgass.cxx    |    2 ++
 sfx2/source/doc/doctdlg.cxx    |    2 ++
 sfx2/source/doc/docvor.cxx     |    6 ++++++
 sfx2/source/doc/new.cxx        |    3 +++
 solenv/gbuild/Configuration.mk |    2 +-
 5 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit dcd3f14c52d056ccb7117622a6b2bf939ab0567d
Author: Andras Timar <atimar at suse.com>
Date:   Mon Aug 22 16:35:08 2011 +0200

    set SDF directory correctly so translations get picked up

diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 06dce58..6e8e007 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -225,7 +225,7 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) :
 gb_XcuMergeTarget_CFGEXTARGET := $(call gb_Executable_get_target,cfgex)
 gb_XcuMergeTarget_CFGEXCOMMAND := \
 	$(gb_CFGEXPRECOMMAND) $(gb_XcuMergeTarget_CFGEXTARGET)
-gb_XcuMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf/
+gb_XcuMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
 
 # PRJNAME is computed from the stem (parameter $(2))
 define gb_XcuMergeTarget__command
commit 50b7733fa41879a62d35cab64da59b109e1a8502
Author: Peter Rabi <prabi at caesar.elte.hu>
Date:   Thu Aug 11 11:18:45 2011 +0200

    Make template names appear in the correct word order
    
    This patch turns on sorting in many listboxes containing template or region names in Impress.
    Contributed under license LGPLv3+/MPL.

diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 44426e8..9e44987 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -456,6 +456,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     mpPage1RegionLB->SetSelectHdl(LINK(this,AssistentDlgImpl,SelectRegionHdl));
     mpPage1RegionLB->SetDropDownLineCount( 6 );
     mpPage1TemplateLB->SetSelectHdl(LINK(this,AssistentDlgImpl,SelectTemplateHdl));
+    mpPage1TemplateLB->SetStyle(mpPage1TemplateLB->GetStyle() | WB_SORT);
     mpPage1TemplateLB->InsertEntry(String(SdResId(STR_ISLOADING)));
 
     mpPage1EmptyRB->SetClickHdl(LINK(this,AssistentDlgImpl,StartTypeHdl));
@@ -494,6 +495,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
     mpPage2RegionLB->SetSelectHdl(LINK(this,AssistentDlgImpl,SelectRegionHdl));
     mpPage2RegionLB->SetDropDownLineCount( 6 );
     mpPage2LayoutLB->SetSelectHdl(LINK(this,AssistentDlgImpl,SelectLayoutHdl));
+    mpPage2LayoutLB->SetStyle(mpPage2LayoutLB->GetStyle() | WB_SORT);
     mpPage2LayoutLB->InsertEntry(String(SdResId(STR_ISLOADING)));
 
     // Seite 3
diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx
index 360b1fe..36cd638 100644
--- a/sfx2/source/doc/doctdlg.cxx
+++ b/sfx2/source/doc/doctdlg.cxx
@@ -75,6 +75,8 @@ SfxDocumentTemplateDlg::SfxDocumentTemplateDlg( Window * pParent, SfxDocumentTem
     aNameEd.SetModifyHdl(LINK(this, SfxDocumentTemplateDlg, NameModify));
     aOkBt.SetClickHdl(LINK(this, SfxDocumentTemplateDlg, OkHdl));
     aEditBt.SetClickHdl(LINK(this, SfxDocumentTemplateDlg, EditHdl));
+    aRegionLb.SetStyle(aRegionLb.GetStyle() | WB_SORT);
+    aTemplateLb.SetStyle(aTemplateLb.GetStyle() | WB_SORT);
     Init();
 }
 
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 4a81f92..7f2268d 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -219,6 +219,12 @@ SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent,
     pFileDlg    ( NULL )
 
 {
+    // Enable sorting in the listboxes
+    aLeftLb.GetModel()->SetSortMode( SortAscending );
+    aRightLb.GetModel()->SetSortMode( SortAscending );
+    aLeftLb.GetModel()->SetCompareHdl( LINK( &aLeftLb, SvTreeListBox, DefaultCompare ) );
+    aRightLb.GetModel()->SetCompareHdl( LINK( &aRightLb, SvTreeListBox, DefaultCompare ) );
+
     // update the SfxDocumentTemplates the manager works with
     if ( aMgr.GetTemplates() )  // should never fail, but who knows ....
     {
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 7f05f54..b54b292 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -613,6 +613,9 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
     aTemplateLb.SetSelectHdl(LINK(this, SfxNewFileDialog_Impl, TemplateSelect));
     aTemplateLb.SetDoubleClickHdl(LINK(this, SfxNewFileDialog_Impl, DoubleClick));
 
+    aTemplateLb.SetStyle(aTemplateLb.GetStyle() | WB_SORT);
+    aRegionLb.SetStyle(aRegionLb.GetStyle() | WB_SORT);
+
     // update the template configuration if necessary
     {
         WaitObject aWaitCursor( pAntiImplP->GetParent() );