diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-01-21 13:49:22 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-01-21 13:49:22 +0100 |
| commit | 5fc2b31a91680c7e4548ff9ffcf2638a48639bea (patch) | |
| tree | bf370125585f46ff7a297ac1aa12f93e0f06dfe6 /sw/source/ui/app | |
| parent | e488bbd9693d9162082dafc5ea8cea6085cdb372 (diff) | |
| parent | fdde737ea0caf7450a6676f46651f78ee05321ab (diff) | |
resync to DEV300_m70
Diffstat (limited to 'sw/source/ui/app')
| -rw-r--r-- | sw/source/ui/app/docsh2.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/app/docst.cxx | 1 | ||||
| -rw-r--r-- | sw/source/ui/app/mn.src | 6 |
3 files changed, 2 insertions, 7 deletions
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 4fdea2d38106..3e1820bf7b75 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -1132,7 +1132,7 @@ void SwDocShell::Execute(SfxRequest& rReq) xRef( pClipCntnr ); pClipCntnr->CopyAnyData( FORMAT_RTF, (sal_Char*) - pStrm->GetData(), pStrm->GetSize() ); + pStrm->GetData(), pStrm->GetEndOfData() ); pClipCntnr->CopyToClipboard( GetView()? (Window*)&GetView()->GetEditWin() : 0 ); delete pStrm; diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx index b8cebf13686f..780f0920054e 100644 --- a/sw/source/ui/app/docst.cxx +++ b/sw/source/ui/app/docst.cxx @@ -42,6 +42,7 @@ #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/newstyle.hxx> +#include <sfx2/printer.hxx> #include <svl/macitem.hxx> #include <editeng/brshitem.hxx> #include <svl/stritem.hxx> diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index c58eaa369fc0..f89046c40f74 100644 --- a/sw/source/ui/app/mn.src +++ b/sw/source/ui/app/mn.src @@ -1065,12 +1065,6 @@ Menu MN_PPREVIEW_POPUPMENU HelpID = FN_PRINT_PAGEPREVIEW ; Text [ en-US ] = "Print" ; }; - MenuItem - { - Identifier = FN_PREVIEW_PRINT_OPTIONS; - HelpID = FN_PREVIEW_PRINT_OPTIONS; - Text [ en-US ] = "Print Options"; - }; SEPARATOR ; MenuItem { |