dbmgr.cxx (efeef26f) dbmgr.cxx (60e513e9)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 2488 unchanged lines hidden (view full) ---

2497 sal_Bool bWithDataSourceBrowser)
2498{
2499 //prevent second call
2500 if(pImpl->pMergeDialog)
2501 return ;
2502 rtl::OUString sDataSource, sDataTableOrQuery;
2503 Sequence<Any> aSelection;
2504
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 2488 unchanged lines hidden (view full) ---

2497 sal_Bool bWithDataSourceBrowser)
2498{
2499 //prevent second call
2500 if(pImpl->pMergeDialog)
2501 return ;
2502 rtl::OUString sDataSource, sDataTableOrQuery;
2503 Sequence<Any> aSelection;
2504
2505 sal_Int16 nCmdType = CommandType::TABLE;
2505 sal_Int32 nCmdType = CommandType::TABLE;
2506 uno::Reference< XConnection> xConnection;
2507
2508 ODataAccessDescriptor aDescriptor(rProperties);
2509 sDataSource = aDescriptor.getDataSource();
2510 aDescriptor[daCommand] >>= sDataTableOrQuery;
2511 aDescriptor[daCommandType] >>= nCmdType;
2512
2513 if ( aDescriptor.has(daSelection) )

--- 598 unchanged lines hidden --- 		2506 uno::Reference< XConnection> xConnection;
2507
2508 ODataAccessDescriptor aDescriptor(rProperties);
2509 sDataSource = aDescriptor.getDataSource();
2510 aDescriptor[daCommand] >>= sDataTableOrQuery;
2511 aDescriptor[daCommandType] >>= nCmdType;
2512
2513 if ( aDescriptor.has(daSelection) )

--- 598 unchanged lines hidden ---