diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-15 19:31:47 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-15 19:31:47 +0100 |
| commit | 5d2d51330deb5c5005fad74e97a895759b7a31fe (patch) | |
| tree | 73dd88b59e886a92d0cfcd42cb9866d599e0c35f | |
| parent | f48bbcd7564369ed287bef5416174e7f6e98160b (diff) | |
addrbk-datasrc-ordering.diff migrated to master
| -rw-r--r-- | patches/dev300/addrbk-datasrc-ordering.diff | 34 | ||||
| -rw-r--r-- | patches/dev300/apply | 2 |
2 files changed, 0 insertions, 36 deletions
diff --git a/patches/dev300/addrbk-datasrc-ordering.diff b/patches/dev300/addrbk-datasrc-ordering.diff deleted file mode 100644 index fa895d9e6..000000000 --- a/patches/dev300/addrbk-datasrc-ordering.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- - dbaccess/source/ui/browser/dbtreeview.cxx | 2 +- - sw/source/ui/dbui/dbtree.cxx | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git dbaccess/source/ui/browser/dbtreeview.cxx dbaccess/source/ui/browser/dbtreeview.cxx -index e3c95e5..920e96c 100644 ---- dbaccess/source/ui/browser/dbtreeview.cxx -+++ dbaccess/source/ui/browser/dbtreeview.cxx -@@ -60,7 +60,7 @@ DBTreeView::DBTreeView( Window* pParent, const Reference< XMultiServiceFactory > - { - DBG_CTOR(DBTreeView,NULL); - -- m_pTreeListBox = new DBTreeListBox(this, _rxORB ,WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT,sal_True); -+ m_pTreeListBox = new DBTreeListBox(this, _rxORB ,WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT); - m_pTreeListBox->EnableCheckButton(NULL); - m_pTreeListBox->SetDragDropMode( 0 ); - m_pTreeListBox->EnableInplaceEditing( sal_True ); -diff --git sw/source/ui/dbui/dbtree.cxx sw/source/ui/dbui/dbtree.cxx -index 4b31760..37bd962 100644 ---- sw/source/ui/dbui/dbtree.cxx -+++ sw/source/ui/dbui/dbtree.cxx -@@ -260,7 +260,7 @@ void SwDBTreeList::InitTreeList() - if(!pImpl->HasContext() && pImpl->GetWrtShell()) - return; - SetSelectionMode(SINGLE_SELECTION); -- SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); -+ SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); - // Font nicht setzen, damit der Font des Controls uebernommen wird! - SetSpaceBetweenEntries(0); - SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE), --- -1.7.0.1 - diff --git a/patches/dev300/apply b/patches/dev300/apply index 84f5b7442..72591056a 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -343,8 +343,6 @@ pyuno-ooodir.diff, i#90701 system-python-uno-path.diff, i#97629 [ Misc ] -# Address data source ordering x#62860 -addrbk-datasrc-ordering.diff, michael # Changed the default option in the Templates and Documents dialog. svtools-default-new-document.diff, rodo |