diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:31 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:31 +0200 |
commit | 4f30c816fa0fb66e650d4e85304292b5ec72b22d (patch) | |
tree | 2c6ae8d7c2f6eb55686bb306afe1b1fce5172be8 /sd/source/ui/docshell/docshell.cxx | |
parent | 2ebf6456709b2345fcd340137b10ff7bb47a3263 (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 40849a63d4ca6da479ef28e129b15109a42e8617 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:18 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 2764d5adfcd646794593cda200fca9d4988d0d06
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:37 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
Notes:
split repo tag: impress_libreoffice-3.3.0.4
Diffstat (limited to 'sd/source/ui/docshell/docshell.cxx')
-rw-r--r-- | sd/source/ui/docshell/docshell.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index aaaecc27f71e..4cf2b44c551d 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,8 +97,8 @@ SFX_IMPL_INTERFACE(DrawDocShell, SfxObjectShell, SdResId(0)) namespace sd { -#define POOL_BUFFER_SIZE (USHORT)32768 -#define BASIC_BUFFER_SIZE (USHORT)8192 +#define POOL_BUFFER_SIZE (USHORT)32768 +#define BASIC_BUFFER_SIZE (USHORT)8192 #define DOCUMENT_BUFFER_SIZE (USHORT)32768 @@ -246,8 +246,8 @@ DrawDocShell::~DrawDocShell() delete mpDoc; // damit der Navigator das Verschwinden des Dokuments mitbekommt - SfxBoolItem aItem(SID_NAVIGATOR_INIT, TRUE); - SfxViewFrame* pFrame = mpViewShell ? mpViewShell->GetFrame() : GetFrame(); + SfxBoolItem aItem(SID_NAVIGATOR_INIT, TRUE); + SfxViewFrame* pFrame = mpViewShell ? mpViewShell->GetFrame() : GetFrame(); if( !pFrame ) pFrame = SfxViewFrame::GetFirst( this ); @@ -299,11 +299,11 @@ void DrawDocShell::GetState(SfxItemSet &rSet) case SID_SEARCH_OPTIONS: { - UINT16 nOpt = SEARCH_OPTIONS_SEARCH | + UINT16 nOpt = SEARCH_OPTIONS_SEARCH | SEARCH_OPTIONS_WHOLE_WORDS | - SEARCH_OPTIONS_BACKWARDS | - SEARCH_OPTIONS_REG_EXP | - SEARCH_OPTIONS_EXACT | + SEARCH_OPTIONS_BACKWARDS | + SEARCH_OPTIONS_REG_EXP | + SEARCH_OPTIONS_EXACT | SEARCH_OPTIONS_SIMILARITY | SEARCH_OPTIONS_SELECTION; @@ -590,7 +590,7 @@ void DrawDocShell::ClearUndoBuffer() } pSfxViewFrame = SfxViewFrame::GetNext(*pSfxViewFrame, this, false); } - + SfxUndoManager* pUndoManager = GetUndoManager(); if(pUndoManager && pUndoManager->GetUndoActionCount()) pUndoManager->Clear(); |