← Back to branch summary

~ubuntu-branches/ubuntu/karmic/openoffice.org-l10n/karmic

« back to all changes in this revision

Viewing changes to ooo-build/patches/dev300/sd-create-table-height-fix.diff

  • Committer: Bazaar Package Importer
  • Author(s): Chris Cheney
  • Date: 2009-05-26 18:00:00 UTC
  • Revision ID: james.westby@ubuntu.com-20090526180000-t5otxzhj1rru5ovt
Tags: 1:3.1.0-3ubuntu2
* Copy of the openoffice.org source.
  - debian/changelog: Change source name.
  - debian/control.in: Change source name.
  - debian/control: Regenerate control file.

* Correct path to splitgsi in convert2po.
* Disable gsi-export for Rosetta due to bug in localize.pl.
* Reenable building on sparc.
* Switch boost to 1.38.
* Resynchronise with ooo-build-3-1 (271b85e5ce6b601d75d0693b9c937d1eabd069dc).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ooo-build/patches/dev300/sd-create-table-height-fix.diff
 
1
Set proper table height when creating a fresh one
 
2
 
 
3
From: Thorsten Behrens <thb@openoffice.org>
 
4
 
 
5
 
 
6
---
 
7
 
 
8
 sd/source/ui/table/tablefunction.cxx |    7 ++++++-
 
9
 1 files changed, 6 insertions(+), 1 deletions(-)
 
10
 
 
11
 
 
12
diff --git sd/source/ui/table/tablefunction.cxx sd/source/ui/table/tablefunction.cxx
 
13
index 3e9f471..8ff6d89 100644
 
14
--- sd/source/ui/table/tablefunction.cxx
 
15
+++ sd/source/ui/table/tablefunction.cxx
 
16
@@ -70,6 +70,7 @@
 
17
 #include "DrawViewShell.hxx"
 
18
 #include "drawdoc.hxx"
 
19
 #include "DrawDocShell.hxx"
 
20
+#include "Outliner.hxx"
 
21
 #include "Window.hxx"
 
22
 #include "drawview.hxx"
 
23
 #include "sdresid.hxx"
 
24
@@ -150,8 +151,12 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
 
25
                        nRows = pDlg->getRows();
 
26
                }
 
27
 
 
28
-               Size aSize( 14100, 200 );
 
29
+               Size aSize( 14100, 3000 );
 
30
 
 
31
+        ::sd::Outliner* pSdOutliner = GetDoc()->GetOutliner();
 
32
+        const long nTextHeight = pSdOutliner->GetTextHeight();
 
33
+        aSize.Height() = std::max(aSize.Height(),nRows*nTextHeight);
 
34
+            
 
35
                Point aPos;
 
36
                Rectangle aWinRect(aPos, GetActiveWindow()->GetOutputSizePixel() );
 
37
                aPos = aWinRect.Center();