novell-win32-odma.diff: ODMA dialog implementation.

i#6885, i#32741

6 files changed, 60 insertions, 0 deletions

diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 5bcd887ed4d0..ff9484a11074 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -163,6 +163,11 @@ Directory gid_Dir_Shellnew
     DosName = "shellnew";
 End
 
+Directory gid_Dir_ShellnewToo
+    ParentID = gid_Dir_Program;
+    DosName = "shellnew2";
+End
+
 #endif
 
 Directory gid_Dir_User
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index b6db7c7fdcb4..3c5eea98d581 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -621,6 +621,10 @@ End
 #endif
 #endif
 
+#ifdef WNT
+SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fps_ODMA, fps_odma.uno )
+#endif
+
 SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
 SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
 
@@ -1507,6 +1511,10 @@ SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
 
 SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
 
+#ifdef WNT
+SPECIAL_UNO_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
+#endif
+
 File gid_File_Lib_Lnth
     TXT_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 718f7da2a665..ceeeeed9a02e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1280,24 +1280,56 @@ End
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods)
 
+File gid_File_Shellnew2_Ods_Soffice
+    TXT_FILE_BODY;
+    Styles = (PACKED,WORKSTATION, OVERWRITE);
+    Dir = PREDEFINED_OSWINSHELLNEWDIR;
+    NetDir = gid_Dir_ShellnewToo;
+    Name = "soffice.ods";
+End
+
 #endif
 
 #ifdef WNT
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Odg_Soffice, soffice.odg)
 
+File gid_File_Shellnew2_Odg_Soffice
+    TXT_FILE_BODY;
+    Styles = (PACKED,WORKSTATION, OVERWRITE);
+    Dir = PREDEFINED_OSWINSHELLNEWDIR;
+    NetDir = gid_Dir_ShellnewToo;
+    Name = "soffice.odg";
+End
+
 #endif
 
 #ifdef WNT
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Odp_Soffice, soffice.odp)
 
+File gid_File_Shellnew2_Odp_Soffice
+    TXT_FILE_BODY;
+    Styles = (PACKED,WORKSTATION, OVERWRITE);
+    Dir = PREDEFINED_OSWINSHELLNEWDIR;
+    NetDir = gid_Dir_ShellnewToo;
+    Name = "soffice.odp";
+End
+
 #endif
 
 #ifdef WNT
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Odt_Soffice, soffice.odt)
 
+File gid_File_Shellnew2_Odt_Soffice
+    TXT_FILE_BODY;
+    Styles = (PACKED,WORKSTATION, OVERWRITE);
+    Dir = PREDEFINED_OSWINSHELLNEWDIR;
+    NetDir = gid_Dir_ShellnewToo;
+    Name = "soffice.odt";
+End
+
 #endif
 
 #ifdef UNX
diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm
index 38989858a4b6..ad8510b21fdc 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -128,6 +128,11 @@ sub get_file_component_directory
         return $installer::globals::templatefolder;
     }
 
+    if ( $destdir =~ /\bPREDEFINED_OSWINSHELLNEWDIR\b/ )
+    {
+        return "WindowsShellNewFolder";
+    }
+
     my $destination = $onefile->{'destination'};
 
     installer::pathanalyzer::get_path_from_fullqualifiedname(\$destination);
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index ba6f9a3b75bd..22092f39aa53 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -361,6 +361,12 @@ sub add_root_directories
     $oneline = "TARGETDIR\t\tSourceDir\n";
     push(@{$directorytableref}, $oneline);
 
+    $oneline = "WindowsFolder\tTARGETDIR\tWindows\n";
+    push(@{$directorytableref}, $oneline);
+
+    $oneline = "WindowsShellNewFolder\tWindowsFolder\tShellNew\n";
+    push(@{$directorytableref}, $oneline);
+
     $oneline = "$installer::globals::programfilesfolder\tTARGETDIR\t.\n";
     push(@{$directorytableref}, $oneline);
 
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 09b6df9d33d9..7e355b213ff5 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -28,6 +28,9 @@ LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
 
 .IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 
+# No ODMA on UNX
+ODMA_LIB_LIB=
+
 #
 #externe libs in plattform.mk
 #
@@ -357,6 +360,7 @@ TESTLIB=-ltest
 
 .ELSE				# ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 
+ODMA_LIB_LIB=odma_lib.lib
 AWTLIB*=jawt.lib
 AVMEDIALIB=iavmedia.lib
 ICUINLIB=icuin.lib