[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                         |    6 +++++-
 patches/dev300/oox-import-sheet-protect.diff |   21 ++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit e911fc7fedc3eab3d47fc6cea1a36408dd8ce60f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 11:12:32 2009 +0300

    Adapt oox-import-sheet-protect.diff for dev300-m54
    
    * patches/dev300/oox-import-sheet-protect.diff: Adapt for dev300-m54.

diff --git a/patches/dev300/oox-import-sheet-protect.diff b/patches/dev300/oox-import-sheet-protect.diff
index 8e29e16..8b28de8 100644
--- a/patches/dev300/oox-import-sheet-protect.diff
+++ b/patches/dev300/oox-import-sheet-protect.diff
@@ -34,19 +34,13 @@ index d30106a..fc12fe7 100644
  // ============================================================================
  
  namespace {
-@@ -314,7 +318,12 @@ void WorksheetSettings::finalizeImport()
+@@ -314,6 +318,9 @@ void WorksheetSettings::finalizeImport()
+     if( maSheetProt.mbSheet ) try
      {
-         Reference< XProtectable > xProtectable( getXSpreadsheet(), UNO_QUERY );
-         if( xProtectable.is() )
-+        {
-+            /* ScTableSheetObj::protect () [or actually ScDocFunc::Protect]
-+               only works if UNDO is enabled, otherwise it's a no-op.  */
-+            PropertySet( getXSpreadsheet() ).setProperty( CREATE_OUSTRING( "IsUndoEnabled" ), uno::makeAny( true ) );
-             xProtectable->protect( OUString() );
-+        }
+         Reference< XProtectable > xProtectable( getSheet(), UNO_QUERY_THROW );
++        /* ScTableSheetObj::protect () [or actually ScDocFunc::Protect]
++           only works if UNDO is enabled, otherwise it's a no-op.  */
++        PropertySet( getXSpreadsheet() ).setProperty( CREATE_OUSTRING( "IsUndoEnabled" ), uno::makeAny( true ) );
+         xProtectable->protect( OUString() );
      }
- }
- 
--- 
-1.6.0.rc1.49.g98a8
-
+     catch( Exception& )
commit fca9fc930ab310da80026fc6499b032d94a95e5d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 12 11:05:25 2009 +0300

    Bypass oox-import-comments-fix-add-annotation.diff
    
    * patches/dev300/apply: Bypass oox-import-comments-fix-add-annotation.diff
      for now. It seems to be already present in dev300-m54. At least
      with some stylistic differences. Possibly also functional
      differences.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index e09130b..592e22e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1844,7 +1844,11 @@ oox-import-shape-textbox-hyperlink.diff, n#480854, janneke
 # oox-fix-ole2.diff, n#485418, rodo
 
 oox-custom-shape-polygons.diff, n#485418, rodo
-oox-import-comments-fix-add-annotation.diff, n#480876, janneke
+
+# FIXME: 2009-08-12: This stuff seems to be already in dev300-m54
+# (with some stylistic differences)? --tml
+# oox-import-comments-fix-add-annotation.diff, n#480876, janneke
+
 oox-import-sheet-protect.diff, n#481317, janneke
 oox-fix-slide-background-gradients.diff, n#383555, rodo
 oox-import-drawing-font-spacing.diff, n#479822, rodo