[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scp2/source

[Petr Mladek]

 scp2/source/ooo/directory_ooo.scp  |    5 -----
 scp2/source/ooo/file_extra_ooo.scp |    2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 86b9e2e64e2f049be5af3d898dbf5e1da0c833b5
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Fri May 27 16:51:05 2011 +0200

    move default language independent layout templates
    
    from /share/template
    to   /share/template/common
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>

diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 3807bde..0491782 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -970,11 +970,6 @@ Directory gid_Dir_Share_Template_Wizard
     DosName = "wizard";
 End
 
-Directory gid_Dir_Share_Template_Layout
-    ParentID = gid_Dir_Template;
-    DosName = "layout";
-End
-
 Directory gid_Dir_Share_Template_Wizard_Bitmap
     ParentID = gid_Dir_Share_Template_Wizard;
     DosName = "bitmap";
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 7cf102c..f5be8c8 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -351,7 +351,7 @@ File gid_File_Extra_Tplpresntimpr_Lang
 End
 
 File gid_File_Extra_Tpllayoutimpr
-    Dir = gid_Dir_Share_Template_Layout;
+    Dir = gid_Dir_Template_Common_Layout;
     ARCHIVE_TXT_FILE_BODY;
     Name = "tpllayoutimpr.zip";
 End